diff --git a/rackup.php b/rackup.php
index <HASH>..<HASH> 100755
--- a/rackup.php
+++ b/rackup.php
@@ -1,7 +1,6 @@
 #!/usr/bin/env php
 <?php
-require "lib/Rack.php";
-require "lib/RubyRack.php";
+require "autoload.php";
 
 class App
 {
diff --git a/test/app.php b/test/app.php
index <HASH>..<HASH> 100644
--- a/test/app.php
+++ b/test/app.php
@@ -1,6 +1,6 @@
 <?php
 
-require __DIR__."/../lib/Rack.php";
+require __DIR__."/../autoload.php";
 
 $app = function($env) {
 	return array(200, array('Content-Type' => 'text/html'), array('Hello World!'));
scripts use autoloader now.