diff --git a/autoload.php.dist b/autoload.php.dist
index 54278e28dd4f..8b51fa8ea390 100644
--- a/autoload.php.dist
+++ b/autoload.php.dist
@@ -23,7 +23,7 @@ if (!function_exists('intl_get_error_code')) {
     $loader->registerPrefixFallback(__DIR__.'/src/Symfony/Component/Locale/Resources/stubs');
 }
 if (!interface_exists('SessionHandlerInterface', false)) {
-    $loader->registerPrefixFallback(__DIR__.'/src/Symfony/Component/HttpFoundation/Resources/stubs');
+    $loader->registerPrefix('SessionHandlerInterface', __DIR__.'/src/Symfony/Component/HttpFoundation/Resources/stubs');
 }
 $loader->register();
 
diff --git a/composer.json b/composer.json
index a481c4e463f3..99ed3df514d4 100644
--- a/composer.json
+++ b/composer.json
@@ -56,6 +56,9 @@
         "doctrine/data-fixtures": "1.0.*"
     },
     "autoload": {
-        "psr-0": { "Symfony": "src/" }
+        "psr-0": {
+            "Symfony": "src/",
+            "SessionHandlerInterface": "src/Symfony/Component/HttpFoundation/Resources/stub"
+        }
     }
 }
diff --git a/src/Symfony/Component/HttpFoundation/composer.json b/src/Symfony/Component/HttpFoundation/composer.json
index 09b13f505b17..daf2ee06603c 100644
--- a/src/Symfony/Component/HttpFoundation/composer.json
+++ b/src/Symfony/Component/HttpFoundation/composer.json
@@ -20,7 +20,10 @@
         "php": ">=5.3.2"
     },
     "autoload": {
-        "psr-0": { "Symfony\\Component\\HttpFoundation": "" }
+        "psr-0": {
+            "Symfony\\Component\\HttpFoundation": "",
+            "SessionHandlerInterface": "Symfony/Component/HttpFoundation/Resources/stub"
+        }
     },
     "target-dir": "Symfony/Component/HttpFoundation"
 }