diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3b0f7bea..c67ad057 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,8 @@
 Changelog
 =========
 
+* **2014-06-06**: Updated to PSR-4 autoloading
+
 1.2.0
 -----
 
diff --git a/composer.json b/composer.json
index 768a7a1a..b6a2cde0 100644
--- a/composer.json
+++ b/composer.json
@@ -27,9 +27,10 @@
         "symfony/event-dispatcher": "DynamicRouter can optionally trigger an event at the start of matching. Minimal version ~2.1"
     },
     "autoload": {
-        "psr-0": { "Symfony\\Cmf\\Component\\Routing": "" }
+        "psr-4": {
+            "Symfony\\Cmf\\Component\\Routing\\": ""
+        }
     },
-    "target-dir": "Symfony/Cmf/Component/Routing",
     "extra": {
         "branch-alias": {
             "dev-master": "1.2-dev"