diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5d00ef8..2dcac83 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,7 @@ CHANGELOG
  * BC: Renamed "WampServer" to "ServerProtocol"
  * BC: New "WampServer" component passes Topic container objects of subscribed Connections
  * Option to turn off UTF-8 checks in order to increase performance
+ * Switched dependancy guzzle/guzzle to guzzle/http (no API changes)
  * mbstring no longer required
 
 * 0.1.5 (2012-07-12)
diff --git a/Makefile b/Makefile
index 6d7f5dc..74bbacd 100644
--- a/Makefile
+++ b/Makefile
@@ -22,7 +22,6 @@ profile:
 apidocs:
 	apigen --title Ratchet -d reports/api -s src/ \
 		-s vendor/react \
-		-s vendor/guzzle/guzzle/src/Guzzle/Http \
-		-s vendor/guzzle/guzzle/src/Guzzle/Common \
+		-s vendor/guzzle \
 		-s vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Session \
 		-s vendor/evenement/evenement/src/Evenement
diff --git a/composer.json b/composer.json
index ad1aa0b..3046dbd 100644
--- a/composer.json
+++ b/composer.json
@@ -27,7 +27,7 @@
   , "require": {
         "php": ">=5.3.3"
       , "react/socket": "0.1.*"
-      , "guzzle/guzzle": "2.5.*"
+      , "guzzle/http": "2.8.*"
       , "symfony/http-foundation": "2.1.*"
     }
   , "require-dev": {
diff --git a/composer.lock b/composer.lock
index 4af67ff..a3164c4 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1,13 +1,21 @@
 {
-    "hash": "1b52ec320b406d0b97b00cec6e7586e0",
+    "hash": "8e06f011f15dae3364497835c0e86e08",
     "packages": [
         {
             "package": "evenement/evenement",
             "version": "v1.0.0"
         },
         {
-            "package": "guzzle/guzzle",
-            "version": "v2.5.0"
+            "package": "guzzle/common",
+            "version": "v2.8.1"
+        },
+        {
+            "package": "guzzle/http",
+            "version": "v2.8.1"
+        },
+        {
+            "package": "guzzle/parser",
+            "version": "v2.8.1"
         },
         {
             "package": "react/event-loop",