diff --git a/lib/base.php b/lib/base.php
index 6896c91822..1d525f7e19 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -321,6 +321,18 @@ class OC
 		return OC::$router;
 	}
 
+
+        public static function loadAppClassPaths()
+        {
+                foreach(OC_APP::getEnabledApps() as $app) {
+                        $file = OC_App::getAppPath($app).'/appinfo/classpath.php';
+                        if(file_exists($file)) {
+                                require_once $file;
+                        }
+                }
+        }
+
+
 	public static function init()
 	{
 		// register autoloader
@@ -537,6 +549,11 @@ class OC
 			header('location: ' . OC_Helper::linkToRemote('webdav'));
 			return;
 		}
+
+                // load all the classpaths from the enabled apps so they are available
+                // in the routing files of each app
+                OC::loadAppClassPaths();
+
 		try {
 			OC::getRouter()->match(OC_Request::getPathInfo());
 			return;