diff --git a/LegacyAutoloader.php b/LegacyAutoloader.php
new file mode 100644
index 00000000000..44b4a62e282
--- /dev/null
+++ b/LegacyAutoloader.php
@@ -0,0 +1,31 @@
+<?php
+
+class LegacyAutoloader
+{
+    public function __construct()
+    {
+        spl_autoload_register(array($this, 'load_class'));
+    }
+
+    public static function register()
+    {
+        new LegacyAutoloader();
+    }
+
+    public function load_class($className)
+    {
+        if (strpos($className, 'Matomo\\') === 0) {
+            $newName = 'Piwik' . substr($className, 6);
+            if (class_exists($newName) && !class_exists($className, false)) {
+                @class_alias($newName, $className);
+            }
+        } elseif (strpos($className, 'Piwik\\') === 0) {
+            $newName = 'Matomo' . substr($className, 5);
+            if (class_exists($newName) && !class_exists($className, false)) {
+                @class_alias($newName, $className);
+            }
+        }
+    }
+}
+
+LegacyAutoloader::register();
\ No newline at end of file
diff --git a/composer.json b/composer.json
index 50f0f6db9da..ef29878e899 100644
--- a/composer.json
+++ b/composer.json
@@ -146,7 +146,8 @@
             "HTML_": "libs/",
             "PEAR_": "libs/",
             "Archive_": "libs/"
-        }
+        },
+        "files": ["LegacyAutoloader.php"]
     },
     "autoload-dev": {
         "psr-4": {