diff --git a/composer.json b/composer.json
index 456d590..a5f8aea 100644
--- a/composer.json
+++ b/composer.json
@@ -19,7 +19,12 @@
         "satooshi/php-coveralls": "*"
     },
     "autoload": {
-        "psr-0": { "Fenom\\": "src/Fenom/", "Fenom": "src/" },
-        "classmap": [ "src/" ]
+        "psr-4": {
+            "Fenom\\": "src/Fenom/"
+        },
+        "psr-0": {
+            "Fenom": "src/"
+        },
+        "classmap": ["src/"]
     }
 }