diff --git a/src/Composer/Autoload/AutoloadGenerator.php b/src/Composer/Autoload/AutoloadGenerator.php
index 78eb09f2f..f58b427b1 100644
--- a/src/Composer/Autoload/AutoloadGenerator.php
+++ b/src/Composer/Autoload/AutoloadGenerator.php
@@ -93,7 +93,12 @@ EOF;
                     $path = strtr($path, '\\', '/');
                     $baseDir = '';
                     if (!$filesystem->isAbsolutePath($path)) {
-                        if (strpos($path, $relVendorPath) === 0) {
+                        // vendor dir == working dir
+                        if (preg_match('{^(\./?)?$}', $relVendorPath)) {
+                            $path = '/'.$path;
+                            $baseDir = '$vendorDir . ';
+                        } elseif (strpos($path, $relVendorPath) === 0) {
+                            // path starts with vendor dir
                             $path = substr($path, strlen($relVendorPath));
                             $baseDir = '$vendorDir . ';
                         } else {
diff --git a/tests/Composer/Test/Autoload/AutoloadGeneratorTest.php b/tests/Composer/Test/Autoload/AutoloadGeneratorTest.php
index d444e5dfa..329615240 100644
--- a/tests/Composer/Test/Autoload/AutoloadGeneratorTest.php
+++ b/tests/Composer/Test/Autoload/AutoloadGeneratorTest.php
@@ -79,8 +79,17 @@ class AutoloadGeneratorTest extends \PHPUnit_Framework_TestCase
 
     public function testVendorDirSameAsWorkingDir()
     {
-        chdir($this->vendorDir);
-        $this->testMainPackageAutoloading();
+        $this->vendorDir = $this->workingDir;
+
+        $package = new MemoryPackage('a', '1.0', '1.0');
+        $package->setAutoload(array('psr-0' => array('Main' => 'src/', 'Lala' => 'src/')));
+
+        $this->repo->expects($this->once())
+            ->method('getPackages')
+            ->will($this->returnValue(array()));
+
+        $this->generator->dump($this->repo, $package, $this->im, $this->vendorDir.'/.composer');
+        $this->assertAutoloadFiles('main3', $this->vendorDir.'/.composer');
     }
 
     public function testMainPackageAutoloadingAlternativeVendorDir()
diff --git a/tests/Composer/Test/Autoload/Fixtures/autoload_main3.php b/tests/Composer/Test/Autoload/Fixtures/autoload_main3.php
new file mode 100644
index 000000000..6f12b3d75
--- /dev/null
+++ b/tests/Composer/Test/Autoload/Fixtures/autoload_main3.php
@@ -0,0 +1,10 @@
+<?php
+
+// autoload_namespace.php generated by Composer
+
+$vendorDir = dirname(__DIR__);
+
+return array(
+    'Main' => $vendorDir . '/src/',
+    'Lala' => $vendorDir . '/src/',
+);