diff --git a/src/Composer/Autoload/AutoloadGenerator.php b/src/Composer/Autoload/AutoloadGenerator.php
new file mode 100644
index 000000000..be456d2bb
--- /dev/null
+++ b/src/Composer/Autoload/AutoloadGenerator.php
@@ -0,0 +1,127 @@
+<?php
+
+/*
+ * This file is part of Composer.
+ *
+ * (c) Nils Adermann <naderman@naderman.de>
+ *     Jordi Boggiano <j.boggiano@seld.be>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Composer\Autoload;
+
+use Composer\Installer\InstallationManager;
+use Composer\Json\JsonFile;
+use Composer\Package\Loader\JsonLoader;
+use Composer\Package\PackageInterface;
+use Composer\Repository\RepositoryInterface;
+
+/**
+ * @author Igor Wiedler <igor@wiedler.ch>
+ */
+class AutoloadGenerator
+{
+    private $localRepo;
+    private $package;
+    private $installationManager;
+
+    public function __construct(RepositoryInterface $localRepo, PackageInterface $package, InstallationManager $installationManager)
+    {
+        $this->localRepo = $localRepo;
+        $this->package = $package;
+        $this->installationManager = $installationManager;
+    }
+
+    public function dump($targetFilename)
+    {
+        $autoloads = $this->parseAutoloads();
+
+        $file = <<<'EOF'
+<?php
+// autoload.php generated by composer
+
+require_once __DIR__.'/../vendor/symfony/symfony/src/Symfony/Component/ClassLoader/UniversalClassLoader.php';
+
+use Symfony\Component\ClassLoader\UniversalClassLoader;
+
+$loader = new UniversalClassLoader();
+
+EOF;
+
+        if (isset($autoloads['psr0'])) {
+            foreach ($autoloads['psr0'] as $def) {
+                foreach ($def['mapping'] as $namespace => $path) {
+                    $exportedNamespace = var_export($namespace, true);
+                    $exportedPath = var_export(($def['path'] ? '/'.$def['path'] : '').'/'.$path, true);
+                    $file .= <<<EOF
+\$loader->registerNamespace($exportedNamespace, dirname(__DIR__).$exportedPath);
+
+EOF;
+                }
+            }
+        }
+
+        if (isset($autoloads['pear'])) {
+            foreach ($autoloads['pear'] as $def) {
+                foreach ($def['mapping'] as $prefix => $path) {
+                    $exportedPrefix = var_export($prefix, true);
+                    $exportedPath = var_export(($def['path'] ? '/'.$def['path'] : '').'/'.$path, true);
+                    $file .= <<<EOF
+\$loader->registerPrefix($exportedPrefix, dirname(__DIR__).$exportedPath);
+
+EOF;
+                }
+            }
+        }
+
+        $file .= <<<'EOF'
+$loader->register();
+
+EOF;
+
+        file_put_contents($targetFilename, $file);
+    }
+
+    private function parseAutoloads()
+    {
+        $installPaths = array();
+        foreach ($this->localRepo->getPackages() as $package) {
+            $installPaths[] = array(
+                $this->getFullPackage($package),
+                $this->installationManager->getInstallPath($package)
+            );
+        }
+        $installPaths[] = array($package, '');
+
+        $autoloads = array();
+        foreach ($installPaths as $item) {
+            list($package, $installPath) = $item;
+
+            if (null !== $package->getTargetDir()) {
+                $installPath = substr($installPath, 0, -strlen('/'.$package->getTargetDir()));
+            }
+
+            foreach ($package->getAutoload() as $type => $mapping) {
+                $autoloads[$type] = isset($autoloads[$type]) ? $autoloads[$type] : array();
+                $autoloads[$type][] = array(
+                    'mapping'   => $mapping,
+                    'path'      => $installPath,
+                );
+            }
+        }
+
+        return $autoloads;
+    }
+
+    private function getFullPackage(PackageInterface $package)
+    {
+        $path = $this->installationManager->getInstallPath($package);
+
+        $loader = new JsonLoader();
+        $fullPackage = $loader->load(new JsonFile($path.'/composer.json'));
+
+        return $fullPackage;
+    }
+}
diff --git a/src/Composer/Command/InstallCommand.php b/src/Composer/Command/InstallCommand.php
index 203a41237..b8718c50a 100644
--- a/src/Composer/Command/InstallCommand.php
+++ b/src/Composer/Command/InstallCommand.php
@@ -12,6 +12,7 @@
 
 namespace Composer\Command;
 
+use Composer\Autoload\AutoloadGenerator;
 use Composer\DependencyResolver;
 use Composer\DependencyResolver\Pool;
 use Composer\DependencyResolver\Request;
@@ -110,102 +111,11 @@ EOT
         $localRepo->write();
 
         $output->writeln('> Generating autoload.php');
-        $this->generateAutoload($composer, $installationManager);
+        $localRepo = new \Composer\Repository\FilesystemRepository(
+            new \Composer\Json\JsonFile('.composer/installed.json'));
+        $generator = new AutoloadGenerator($localRepo, $composer->getPackage(), $installationManager);
+        $generator->dump('.composer/autoload.php');
 
         $output->writeln('> Done');
     }
-
-    private function generateAutoload(\Composer\Composer $composer,
-        \Composer\Installer\InstallationManager $installationManager)
-    {
-        $localRepo = new \Composer\Repository\FilesystemRepository(
-            new \Composer\Json\JsonFile('.composer/installed.json'));
-
-        $installPaths = array();
-        foreach ($localRepo->getPackages() as $package) {
-            $installPaths[] = array(
-                $this->getFullPackage($package, $installationManager),
-                $installationManager->getInstallPath($package)
-            );
-        }
-        $installPaths[] = array($composer->getPackage(), '');
-
-        $autoloads = array();
-        foreach ($installPaths as $item) {
-            list($package, $installPath) = $item;
-
-            if (null !== $package->getTargetDir()) {
-                $installPath = substr($installPath, 0, -strlen('/'.$package->getTargetDir()));
-            }
-
-            foreach ($package->getAutoload() as $type => $mapping) {
-                $autoloads[$type] = isset($autoloads[$type]) ? $autoloads[$type] : array();
-                $autoloads[$type][] = array(
-                    'mapping'   => $mapping,
-                    'path'      => $installPath,
-                );
-            }
-        }
-
-        $this->dumpAutoload($autoloads);
-    }
-
-    private function dumpAutoload(array $autoloads)
-    {
-        $file = <<<'EOF'
-<?php
-// autoload.php generated by composer
-
-require_once __DIR__.'/../vendor/symfony/symfony/src/Symfony/Component/ClassLoader/UniversalClassLoader.php';
-
-use Symfony\Component\ClassLoader\UniversalClassLoader;
-
-$loader = new UniversalClassLoader();
-
-EOF;
-
-        if (isset($autoloads['psr0'])) {
-            foreach ($autoloads['psr0'] as $def) {
-                foreach ($def['mapping'] as $namespace => $path) {
-                    $exportedNamespace = var_export($namespace, true);
-                    $exportedPath = var_export(($def['path'] ? '/'.$def['path'] : '').'/'.$path, true);
-                    $file .= <<<EOF
-\$loader->registerNamespace($exportedNamespace, dirname(__DIR__).$exportedPath);
-
-EOF;
-                }
-            }
-        }
-
-        if (isset($autoloads['pear'])) {
-            foreach ($autoloads['pear'] as $def) {
-                foreach ($def['mapping'] as $prefix => $path) {
-                    $exportedPrefix = var_export($prefix, true);
-                    $exportedPath = var_export(($def['path'] ? '/'.$def['path'] : '').'/'.$path, true);
-                    $file .= <<<EOF
-\$loader->registerPrefix($exportedPrefix, dirname(__DIR__).$exportedPath);
-
-EOF;
-                }
-            }
-        }
-
-        $file .= <<<'EOF'
-$loader->register();
-
-EOF;
-
-        file_put_contents('.composer/autoload.php', $file);
-    }
-
-    private function getFullPackage(\Composer\Package\PackageInterface $package,
-        \Composer\Installer\InstallationManager $installationManager)
-    {
-        $path = $installationManager->getInstallPath($package);
-
-        $loader  = new \Composer\Package\Loader\JsonLoader();
-        $fullPackage = $loader->load(new \Composer\Json\JsonFile($path.'/composer.json'));
-
-        return $fullPackage;
-    }
 }