diff --git a/composer.json b/composer.json
new file mode 100644
index 0000000..cd7d409
--- /dev/null
+++ b/composer.json
@@ -0,0 +1,40 @@
+{
+  "name": "drush",
+  "description": "",
+  "keywords": [],
+  "homepage": "http://drupal.org/project/drush",
+  "license": "GPLv3",
+  "authors": [
+    {"name": "Moshe Weitzman", "email": "weitzman@tejasa.com"},
+    {"name": "Owen Barton", "email": "drupal@owenbarton.com"},
+    {"name": "Mark Sonnabaum", "email": "marksonnabaum@gmail.com"},
+    {"name": "Antoine Beaupré", "email": "anarcat@koumbit.org"},
+    {"name": "Greg Anderson", "email": "greg.1.anderson@greenknowe.org"},
+    {"name": "Jonathan Araña Cruz", "email": "jonhattan@faita.net"},
+    {"name": "Jonathan Hedstrom", "email": "jhedstrom@gmail.com"}
+  ],
+  "repositories": [
+    {"type": "pear", "url": "http://pear.php.net"},
+    {"type": "package",
+      "package": {
+        "name": "youngj/httpserver",
+        "version": "1.0.0",
+        "source": {
+          "url": "https://github.com/youngj/httpserver",
+          "type": "git",
+          "reference": "41dd2b7160b8cbd25d7b5383e3ffc6d8a9a59478"
+        }
+      }
+    }
+  ],
+  "autoload": {
+    "psr-0": { "Drush": "lib/" }
+  },
+  "require": {
+    "php": ">=5.3.2",
+    "symfony/yaml": ">=2.0.12",
+    "composer/composer": "1.0.0-alpha1",
+    "pear-pear/Console_Table": "*",
+    "youngj/httpserver": "*"
+  }
+}
diff --git a/includes/bootstrap.inc b/includes/bootstrap.inc
index 95fc732..f09da8f 100644
--- a/includes/bootstrap.inc
+++ b/includes/bootstrap.inc
@@ -977,6 +977,12 @@ function drush_bootstrap_value($context, $value = null) {
 function drush_bootstrap_prepare() {
   define('DRUSH_BASE_PATH', dirname(dirname(__FILE__)));
 
+  if (version_compare(PHP_VERSION, '5.3.0') < 0) {
+    $autoload_path = DRUSH_BASE_PATH . '/vendor/.composer/autoload.php';
+    if (file_exists($autoload_path)) {
+      require_once $autoload_path;
+    }
+  }
   require_once DRUSH_BASE_PATH . '/includes/environment.inc';
   require_once DRUSH_BASE_PATH . '/includes/command.inc';
   require_once DRUSH_BASE_PATH . '/includes/drush.inc';