diff --git a/CHANGELOG.md b/CHANGELOG.md
index d11865998..c410a49c5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 2.10.4
+**Improvement**
+* Optimized the PSR-4 autoload configuration
+
 ## 2.10.3
 **Bugfix**
 * Rebuilt the Composer lockfile
diff --git a/composer.json b/composer.json
index 1c80450d5..ba340ab5f 100644
--- a/composer.json
+++ b/composer.json
@@ -4,7 +4,6 @@
   "description": "The SURFnet Step-up Self-Service allows Gateway users to create Identities and Tokens.",
   "autoload": {
     "psr-4": {
-      "": "src/",
       "Surfnet\\": "src\\Surfnet"
     },
     "classmap": [