diff --git a/CHANGELOG.md b/CHANGELOG.md
index eac2d44..59bbc75 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,8 @@
 Changelog
 =========
 
+* **2014-06-06**: Updated to PSR-4 autoloading
+
 1.0.3
 -----
 
diff --git a/composer.json b/composer.json
index b2ebd36..8bf262e 100644
--- a/composer.json
+++ b/composer.json
@@ -24,12 +24,11 @@
         "doctrine/phpcr-bundle": "1.*",
         "doctrine/phpcr-odm": "1.*"
     },
-    "autoload":{
-        "psr-0":{
-            "Symfony\\Cmf\\Bundle\\TreeBrowserBundle": ""
+    "autoload": {
+        "psr-4": {
+            "Symfony\\Cmf\\Bundle\\TreeBrowserBundle\\": ""
         }
     },
-    "target-dir": "Symfony/Cmf/Bundle/TreeBrowserBundle",
     "extra": {
         "branch-alias": {
             "dev-master": "1.0-dev"