diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index 40105df..0000000
--- a/.gitmodules
+++ /dev/null
@@ -1,3 +0,0 @@
-[submodule "vendor/guzzle"]
-	path = vendor/guzzle
-	url = git://github.com/guzzle/guzzle.git
diff --git a/composer.json b/composer.json
new file mode 100644
index 0000000..e890714
--- /dev/null
+++ b/composer.json
@@ -0,0 +1,23 @@
+{
+    "name": "cboden/Ratchet"
+  , "type": "library"
+  , "description": "PHP WebSocket server component library"
+  , "keywords": ["WebSocket"]
+  , "license": "MIT"
+  , "authors": [
+        {
+            "name": "Chris Boden"
+          , "email": "cboden@gmail.com"
+          , "homepage": "http://socketo.me"
+        }
+    ]
+  , "autoload": {
+        "psr-0": {
+            "Ratchet": "src/"
+        }
+    }
+  , "require": {
+        "php": ">=5.3.2"
+      , "guzzle/guzzle": ">=2.0.5"
+    }
+}
\ No newline at end of file
diff --git a/vendor/README.md b/vendor/README.md
deleted file mode 100644
index 03f7f86..0000000
--- a/vendor/README.md
+++ /dev/null
@@ -1,5 +0,0 @@
-## External Libraries
-
-### Guzzle
-
-Used to parse the incoming HTTP handshake request.  A Guzzle Request object is then passed around the application for a consistent API. 
\ No newline at end of file
diff --git a/vendor/guzzle b/vendor/guzzle
deleted file mode 160000
index ac64abc..0000000
--- a/vendor/guzzle
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit ac64abc2c05b921efc4623379c1674a282475ae5