diff --git a/composer.json b/composer.json
index 97ef123..de23466 100644
--- a/composer.json
+++ b/composer.json
@@ -1,7 +1,7 @@
 {
   "name": "drupal/drupal",
   "description": "Drupal is an open source content management platform powering millions of websites and applications.",
-  "type": "drupal-core",
+  "type": "drupal-drupal",
   "license": "GPL-2.0+",
   "require": {
     "symfony/class-loader": "2.3.*",
@@ -29,6 +29,9 @@
       "Drupal\\Driver": "drivers/lib/"
     }
   },
+  "replace": {
+    "drupal/core": "self.version"
+  },
   "config": {
     "vendor-dir": "core/vendor",
     "preferred-install": "dist"
diff --git a/core/composer.json b/core/composer.json
new file mode 100644
index 0000000..0f7215f
--- /dev/null
+++ b/core/composer.json
@@ -0,0 +1,34 @@
+{
+  "name": "drupal/core",
+  "description": "Drupal is an open source content management platform powering millions of websites and applications.",
+  "type": "drupal-core",
+  "license": "GPL-2.0+",
+  "require": {
+    "symfony/class-loader": "2.3.*",
+    "symfony/dependency-injection": "2.3.*",
+    "symfony/event-dispatcher": "2.3.*",
+    "symfony/http-foundation": "2.3.*",
+    "symfony/http-kernel": "2.3.*",
+    "symfony/routing": "2.3.*",
+    "symfony/serializer": "2.3.*",
+    "symfony/validator": "2.3.*",
+    "symfony/yaml": "2.3.*",
+    "twig/twig": "1.12.*",
+    "doctrine/common": "2.3.*",
+    "guzzle/http": "3.1.*",
+    "kriswallsmith/assetic": "1.1.*@alpha",
+    "symfony-cmf/routing": "1.1.*@alpha",
+    "easyrdf/easyrdf": "0.8.*@beta",
+    "phpunit/phpunit": "3.7.*",
+    "zendframework/zend-feed": "2.2.*"
+  },
+  "autoload": {
+    "psr-0": {
+      "Drupal\\Core": "lib/",
+      "Drupal\\Component": "lib/"
+    }
+  },
+  "config": {
+    "preferred-install": "dist"
+  }
+}