diff --git a/composer.json b/composer.json
index 495a9896ae..21575b5fa6 100644
--- a/composer.json
+++ b/composer.json
@@ -3,7 +3,10 @@
         "vendor-dir": "lib/composer"
     },
     "autoload" : {
-        "psr-4": {"OC\\": "lib/private"}
+        "psr-4": {
+            "OC\\": "lib/private",
+            "OCP\\": "lib/public"
+        }
     },
     "require-dev": {
         "jakub-onderka/php-parallel-lint": "^0.9.2",
diff --git a/lib/composer/composer/autoload_psr4.php b/lib/composer/composer/autoload_psr4.php
index a4b49f0f55..4610a912c6 100644
--- a/lib/composer/composer/autoload_psr4.php
+++ b/lib/composer/composer/autoload_psr4.php
@@ -7,4 +7,5 @@ $baseDir = dirname(dirname($vendorDir));
 
 return array(
     'OC\\' => array($baseDir . '/lib/private'),
+    'OCP\\' => array($baseDir . '/lib/public'),
 );