diff --git a/composer.json b/composer.json
index 017f57a88f..21df229eaa 100644
--- a/composer.json
+++ b/composer.json
@@ -95,9 +95,12 @@
 	],
 	"autoload": {
 		"psr-4": {
-			"Friendica\\": "src/",
-			"Friendica\\Addon\\": "addon/"
-		}
+			"Friendica\\": "src/"
+		},
+		"classmap": ["addon/"],
+		"exclude-from-classmap": [
+			"addon/*/vendor/"
+		]
 	},
 	"autoload-dev": {
 		"psr-4": {