diff --git a/composer.json b/composer.json
index 6ea14e6d5407cdcf0e6f0bab7902ebd990205613..40500626732cb68b68dd53ca7f412b8422a25741 100644
--- a/composer.json
+++ b/composer.json
@@ -22,5 +22,11 @@
         "php": ">=5.3.0",
         "twig/twig": "1.*",
         "leafo/lessphp": "0.3.*"
+    },
+    "autoload": {
+        "psr-0": {
+            "Piwik\\Core\\": "core/",
+            "Piwik\\Plugin\\": "plugins/"
+        }
     }
 }