diff --git a/src/Composer/Autoload/AutoloadGenerator.php b/src/Composer/Autoload/AutoloadGenerator.php
index 5c6de01b0..99fc35ca6 100644
--- a/src/Composer/Autoload/AutoloadGenerator.php
+++ b/src/Composer/Autoload/AutoloadGenerator.php
@@ -127,11 +127,7 @@ EOF;
         $filesCode = "";
         $autoloads['files'] = new \RecursiveIteratorIterator(new \RecursiveArrayIterator($autoloads['files']));
         foreach ($autoloads['files'] as $functionFile) {
-            if (!$filesystem->isAbsolutePath($functionFile)) {
-                $functionFile = getcwd() . '/'. $functionFile;
-            }
-
-            $filesCode .= '    require __DIR__ . '. var_export('/'.$filesystem->findShortestPath($vendorPath, $functionFile), true).";\n";
+            $filesCode .= '    require '.$this->getPathCode($filesystem, $relVendorPath, $vendorPath, $functionFile).";\n";
         }
 
         file_put_contents($targetDir.'/autoload_namespaces.php', $namespacesFile);
diff --git a/tests/Composer/Test/Autoload/Fixtures/autoload_functions.php b/tests/Composer/Test/Autoload/Fixtures/autoload_functions.php
index 610b4aff1..f39eb8a33 100644
--- a/tests/Composer/Test/Autoload/Fixtures/autoload_functions.php
+++ b/tests/Composer/Test/Autoload/Fixtures/autoload_functions.php
@@ -21,8 +21,8 @@ return call_user_func(function() {
 
     $loader->register();
 
-    require __DIR__ . '/a/a/test.php';
-    require __DIR__ . '/b/b/test2.php';
+    require $vendorDir . '/a/a/test.php';
+    require $vendorDir . '/b/b/test2.php';
 
     return $loader;
 });