diff --git a/actionpack/lib/action_controller.rb b/actionpack/lib/action_controller.rb
index e435bdbae1..1c01aaa277 100644
--- a/actionpack/lib/action_controller.rb
+++ b/actionpack/lib/action_controller.rb
@@ -32,13 +32,6 @@ rescue LoadError
 end
 
 require File.join(File.dirname(__FILE__), "action_pack")
-$:.unshift "#{File.dirname(__FILE__)}/action_controller/vendor/rack-1.0"
-begin
-  gem 'rack', '~> 1.0.0'
-  require 'rack'
-rescue Gem::LoadError
-  require 'action_controller/vendor/rack-1.0/rack'
-end
 
 module ActionController
   # TODO: Review explicit to see if they will automatically be handled by
diff --git a/actionpack/lib/action_dispatch.rb b/actionpack/lib/action_dispatch.rb
index 393ccaa795..b4fdaafbfc 100644
--- a/actionpack/lib/action_dispatch.rb
+++ b/actionpack/lib/action_dispatch.rb
@@ -31,9 +31,13 @@ rescue LoadError
   end
 end
 
-gem 'rack', '>= 0.9.0'
-require 'rack'
-require 'action_dispatch/rack'
+$:.unshift "#{File.dirname(__FILE__)}/action_dispatch/vendor/rack-1.0"
+begin
+  gem 'rack', '~> 1.0.0'
+  require 'rack'
+rescue Gem::LoadError
+  require 'action_dispatch/vendor/rack-1.0/rack'
+end
 
 module ActionDispatch
   autoload :Request, 'action_dispatch/http/request'
diff --git a/actionpack/lib/action_dispatch/rack.rb b/actionpack/lib/action_dispatch/rack.rb
deleted file mode 100644
index 89087c124f..0000000000
--- a/actionpack/lib/action_dispatch/rack.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-# require 'action_dispatch/rack/lock'
-# require 'action_dispatch/rack/multipart'
-# require 'action_dispatch/rack/parse_query'
diff --git a/actionpack/lib/action_controller/vendor/rack-1.0/rack.rb b/actionpack/lib/action_dispatch/vendor/rack-1.0/rack.rb
similarity index 100%
rename from actionpack/lib/action_controller/vendor/rack-1.0/rack.rb
rename to actionpack/lib/action_dispatch/vendor/rack-1.0/rack.rb
diff --git a/actionpack/lib/action_controller/vendor/rack-1.0/rack/adapter/camping.rb b/actionpack/lib/action_dispatch/vendor/rack-1.0/rack/adapter/camping.rb
similarity index 100%
rename from actionpack/lib/action_controller/vendor/rack-1.0/rack/adapter/camping.rb
rename to actionpack/lib/action_dispatch/vendor/rack-1.0/rack/adapter/camping.rb
diff --git a/actionpack/lib/action_controller/vendor/rack-1.0/rack/auth/abstract/handler.rb b/actionpack/lib/action_dispatch/vendor/rack-1.0/rack/auth/abstract/handler.rb
similarity index 100%
rename from actionpack/lib/action_controller/vendor/rack-1.0/rack/auth/abstract/handler.rb
rename to actionpack/lib/action_dispatch/vendor/rack-1.0/rack/auth/abstract/handler.rb
diff --git a/actionpack/lib/action_controller/vendor/rack-1.0/rack/auth/abstract/request.rb b/actionpack/lib/action_dispatch/vendor/rack-1.0/rack/auth/abstract/request.rb
similarity index 100%
rename from actionpack/lib/action_controller/vendor/rack-1.0/rack/auth/abstract/request.rb
rename to actionpack/lib/action_dispatch/vendor/rack-1.0/rack/auth/abstract/request.rb
diff --git a/actionpack/lib/action_controller/vendor/rack-1.0/rack/auth/basic.rb b/actionpack/lib/action_dispatch/vendor/rack-1.0/rack/auth/basic.rb
similarity index 100%
rename from actionpack/lib/action_controller/vendor/rack-1.0/rack/auth/basic.rb
rename to actionpack/lib/action_dispatch/vendor/rack-1.0/rack/auth/basic.rb
diff --git a/actionpack/lib/action_controller/vendor/rack-1.0/rack/auth/digest/md5.rb b/actionpack/lib/action_dispatch/vendor/rack-1.0/rack/auth/digest/md5.rb
similarity index 100%
rename from actionpack/lib/action_controller/vendor/rack-1.0/rack/auth/digest/md5.rb
rename to actionpack/lib/action_dispatch/vendor/rack-1.0/rack/auth/digest/md5.rb
diff --git a/actionpack/lib/action_controller/vendor/rack-1.0/rack/auth/digest/nonce.rb b/actionpack/lib/action_dispatch/vendor/rack-1.0/rack/auth/digest/nonce.rb
similarity index 100%
rename from actionpack/lib/action_controller/vendor/rack-1.0/rack/auth/digest/nonce.rb
rename to actionpack/lib/action_dispatch/vendor/rack-1.0/rack/auth/digest/nonce.rb
diff --git a/actionpack/lib/action_controller/vendor/rack-1.0/rack/auth/digest/params.rb b/actionpack/lib/action_dispatch/vendor/rack-1.0/rack/auth/digest/params.rb
similarity index 100%
rename from actionpack/lib/action_controller/vendor/rack-1.0/rack/auth/digest/params.rb
rename to actionpack/lib/action_dispatch/vendor/rack-1.0/rack/auth/digest/params.rb
diff --git a/actionpack/lib/action_controller/vendor/rack-1.0/rack/auth/digest/request.rb b/actionpack/lib/action_dispatch/vendor/rack-1.0/rack/auth/digest/request.rb
similarity index 100%
rename from actionpack/lib/action_controller/vendor/rack-1.0/rack/auth/digest/request.rb
rename to actionpack/lib/action_dispatch/vendor/rack-1.0/rack/auth/digest/request.rb
diff --git a/actionpack/lib/action_controller/vendor/rack-1.0/rack/auth/openid.rb b/actionpack/lib/action_dispatch/vendor/rack-1.0/rack/auth/openid.rb
similarity index 100%
rename from actionpack/lib/action_controller/vendor/rack-1.0/rack/auth/openid.rb
rename to actionpack/lib/action_dispatch/vendor/rack-1.0/rack/auth/openid.rb
diff --git a/actionpack/lib/action_controller/vendor/rack-1.0/rack/builder.rb b/actionpack/lib/action_dispatch/vendor/rack-1.0/rack/builder.rb
similarity index 100%
rename from actionpack/lib/action_controller/vendor/rack-1.0/rack/builder.rb
rename to actionpack/lib/action_dispatch/vendor/rack-1.0/rack/builder.rb
diff --git a/actionpack/lib/action_controller/vendor/rack-1.0/rack/cascade.rb b/actionpack/lib/action_dispatch/vendor/rack-1.0/rack/cascade.rb
similarity index 100%
rename from actionpack/lib/action_controller/vendor/rack-1.0/rack/cascade.rb
rename to actionpack/lib/action_dispatch/vendor/rack-1.0/rack/cascade.rb
diff --git a/actionpack/lib/action_controller/vendor/rack-1.0/rack/chunked.rb b/actionpack/lib/action_dispatch/vendor/rack-1.0/rack/chunked.rb
similarity index 100%
rename from actionpack/lib/action_controller/vendor/rack-1.0/rack/chunked.rb
rename to actionpack/lib/action_dispatch/vendor/rack-1.0/rack/chunked.rb
diff --git a/actionpack/lib/action_controller/vendor/rack-1.0/rack/commonlogger.rb b/actionpack/lib/action_dispatch/vendor/rack-1.0/rack/commonlogger.rb
similarity index 100%
rename from actionpack/lib/action_controller/vendor/rack-1.0/rack/commonlogger.rb
rename to actionpack/lib/action_dispatch/vendor/rack-1.0/rack/commonlogger.rb
diff --git a/actionpack/lib/action_controller/vendor/rack-1.0/rack/conditionalget.rb b/actionpack/lib/action_dispatch/vendor/rack-1.0/rack/conditionalget.rb
similarity index 100%
rename from actionpack/lib/action_controller/vendor/rack-1.0/rack/conditionalget.rb
rename to actionpack/lib/action_dispatch/vendor/rack-1.0/rack/conditionalget.rb
diff --git a/actionpack/lib/action_controller/vendor/rack-1.0/rack/content_length.rb b/actionpack/lib/action_dispatch/vendor/rack-1.0/rack/content_length.rb
similarity index 100%
rename from actionpack/lib/action_controller/vendor/rack-1.0/rack/content_length.rb
rename to actionpack/lib/action_dispatch/vendor/rack-1.0/rack/content_length.rb
diff --git a/actionpack/lib/action_controller/vendor/rack-1.0/rack/content_type.rb b/actionpack/lib/action_dispatch/vendor/rack-1.0/rack/content_type.rb
similarity index 100%
rename from actionpack/lib/action_controller/vendor/rack-1.0/rack/content_type.rb
rename to actionpack/lib/action_dispatch/vendor/rack-1.0/rack/content_type.rb
diff --git a/actionpack/lib/action_controller/vendor/rack-1.0/rack/deflater.rb b/actionpack/lib/action_dispatch/vendor/rack-1.0/rack/deflater.rb
similarity index 100%
rename from actionpack/lib/action_controller/vendor/rack-1.0/rack/deflater.rb
rename to actionpack/lib/action_dispatch/vendor/rack-1.0/rack/deflater.rb
diff --git a/actionpack/lib/action_controller/vendor/rack-1.0/rack/directory.rb b/actionpack/lib/action_dispatch/vendor/rack-1.0/rack/directory.rb
similarity index 100%
rename from actionpack/lib/action_controller/vendor/rack-1.0/rack/directory.rb
rename to actionpack/lib/action_dispatch/vendor/rack-1.0/rack/directory.rb
diff --git a/actionpack/lib/action_controller/vendor/rack-1.0/rack/file.rb b/actionpack/lib/action_dispatch/vendor/rack-1.0/rack/file.rb
similarity index 100%
rename from actionpack/lib/action_controller/vendor/rack-1.0/rack/file.rb
rename to actionpack/lib/action_dispatch/vendor/rack-1.0/rack/file.rb
diff --git a/actionpack/lib/action_controller/vendor/rack-1.0/rack/handler.rb b/actionpack/lib/action_dispatch/vendor/rack-1.0/rack/handler.rb
similarity index 100%
rename from actionpack/lib/action_controller/vendor/rack-1.0/rack/handler.rb
rename to actionpack/lib/action_dispatch/vendor/rack-1.0/rack/handler.rb
diff --git a/actionpack/lib/action_controller/vendor/rack-1.0/rack/handler/cgi.rb b/actionpack/lib/action_dispatch/vendor/rack-1.0/rack/handler/cgi.rb
similarity index 100%
rename from actionpack/lib/action_controller/vendor/rack-1.0/rack/handler/cgi.rb
rename to actionpack/lib/action_dispatch/vendor/rack-1.0/rack/handler/cgi.rb
diff --git a/actionpack/lib/action_controller/vendor/rack-1.0/rack/handler/evented_mongrel.rb b/actionpack/lib/action_dispatch/vendor/rack-1.0/rack/handler/evented_mongrel.rb
similarity index 100%
rename from actionpack/lib/action_controller/vendor/rack-1.0/rack/handler/evented_mongrel.rb
rename to actionpack/lib/action_dispatch/vendor/rack-1.0/rack/handler/evented_mongrel.rb
diff --git a/actionpack/lib/action_controller/vendor/rack-1.0/rack/handler/fastcgi.rb b/actionpack/lib/action_dispatch/vendor/rack-1.0/rack/handler/fastcgi.rb
similarity index 100%
rename from actionpack/lib/action_controller/vendor/rack-1.0/rack/handler/fastcgi.rb
rename to actionpack/lib/action_dispatch/vendor/rack-1.0/rack/handler/fastcgi.rb
diff --git a/actionpack/lib/action_controller/vendor/rack-1.0/rack/handler/lsws.rb b/actionpack/lib/action_dispatch/vendor/rack-1.0/rack/handler/lsws.rb
similarity index 100%
rename from actionpack/lib/action_controller/vendor/rack-1.0/rack/handler/lsws.rb
rename to actionpack/lib/action_dispatch/vendor/rack-1.0/rack/handler/lsws.rb
diff --git a/actionpack/lib/action_controller/vendor/rack-1.0/rack/handler/mongrel.rb b/actionpack/lib/action_dispatch/vendor/rack-1.0/rack/handler/mongrel.rb
similarity index 100%
rename from actionpack/lib/action_controller/vendor/rack-1.0/rack/handler/mongrel.rb
rename to actionpack/lib/action_dispatch/vendor/rack-1.0/rack/handler/mongrel.rb
diff --git a/actionpack/lib/action_controller/vendor/rack-1.0/rack/handler/scgi.rb b/actionpack/lib/action_dispatch/vendor/rack-1.0/rack/handler/scgi.rb
similarity index 100%
rename from actionpack/lib/action_controller/vendor/rack-1.0/rack/handler/scgi.rb
rename to actionpack/lib/action_dispatch/vendor/rack-1.0/rack/handler/scgi.rb
diff --git a/actionpack/lib/action_controller/vendor/rack-1.0/rack/handler/swiftiplied_mongrel.rb b/actionpack/lib/action_dispatch/vendor/rack-1.0/rack/handler/swiftiplied_mongrel.rb
similarity index 100%
rename from actionpack/lib/action_controller/vendor/rack-1.0/rack/handler/swiftiplied_mongrel.rb
rename to actionpack/lib/action_dispatch/vendor/rack-1.0/rack/handler/swiftiplied_mongrel.rb
diff --git a/actionpack/lib/action_controller/vendor/rack-1.0/rack/handler/thin.rb b/actionpack/lib/action_dispatch/vendor/rack-1.0/rack/handler/thin.rb
similarity index 100%
rename from actionpack/lib/action_controller/vendor/rack-1.0/rack/handler/thin.rb
rename to actionpack/lib/action_dispatch/vendor/rack-1.0/rack/handler/thin.rb
diff --git a/actionpack/lib/action_controller/vendor/rack-1.0/rack/handler/webrick.rb b/actionpack/lib/action_dispatch/vendor/rack-1.0/rack/handler/webrick.rb
similarity index 100%
rename from actionpack/lib/action_controller/vendor/rack-1.0/rack/handler/webrick.rb
rename to actionpack/lib/action_dispatch/vendor/rack-1.0/rack/handler/webrick.rb
diff --git a/actionpack/lib/action_controller/vendor/rack-1.0/rack/head.rb b/actionpack/lib/action_dispatch/vendor/rack-1.0/rack/head.rb
similarity index 100%
rename from actionpack/lib/action_controller/vendor/rack-1.0/rack/head.rb
rename to actionpack/lib/action_dispatch/vendor/rack-1.0/rack/head.rb
diff --git a/actionpack/lib/action_controller/vendor/rack-1.0/rack/lint.rb b/actionpack/lib/action_dispatch/vendor/rack-1.0/rack/lint.rb
similarity index 100%
rename from actionpack/lib/action_controller/vendor/rack-1.0/rack/lint.rb
rename to actionpack/lib/action_dispatch/vendor/rack-1.0/rack/lint.rb
diff --git a/actionpack/lib/action_controller/vendor/rack-1.0/rack/lobster.rb b/actionpack/lib/action_dispatch/vendor/rack-1.0/rack/lobster.rb
similarity index 100%
rename from actionpack/lib/action_controller/vendor/rack-1.0/rack/lobster.rb
rename to actionpack/lib/action_dispatch/vendor/rack-1.0/rack/lobster.rb
diff --git a/actionpack/lib/action_controller/vendor/rack-1.0/rack/lock.rb b/actionpack/lib/action_dispatch/vendor/rack-1.0/rack/lock.rb
similarity index 100%
rename from actionpack/lib/action_controller/vendor/rack-1.0/rack/lock.rb
rename to actionpack/lib/action_dispatch/vendor/rack-1.0/rack/lock.rb
diff --git a/actionpack/lib/action_controller/vendor/rack-1.0/rack/methodoverride.rb b/actionpack/lib/action_dispatch/vendor/rack-1.0/rack/methodoverride.rb
similarity index 100%
rename from actionpack/lib/action_controller/vendor/rack-1.0/rack/methodoverride.rb
rename to actionpack/lib/action_dispatch/vendor/rack-1.0/rack/methodoverride.rb
diff --git a/actionpack/lib/action_controller/vendor/rack-1.0/rack/mime.rb b/actionpack/lib/action_dispatch/vendor/rack-1.0/rack/mime.rb
similarity index 100%
rename from actionpack/lib/action_controller/vendor/rack-1.0/rack/mime.rb
rename to actionpack/lib/action_dispatch/vendor/rack-1.0/rack/mime.rb
diff --git a/actionpack/lib/action_controller/vendor/rack-1.0/rack/mock.rb b/actionpack/lib/action_dispatch/vendor/rack-1.0/rack/mock.rb
similarity index 100%
rename from actionpack/lib/action_controller/vendor/rack-1.0/rack/mock.rb
rename to actionpack/lib/action_dispatch/vendor/rack-1.0/rack/mock.rb
diff --git a/actionpack/lib/action_controller/vendor/rack-1.0/rack/recursive.rb b/actionpack/lib/action_dispatch/vendor/rack-1.0/rack/recursive.rb
similarity index 100%
rename from actionpack/lib/action_controller/vendor/rack-1.0/rack/recursive.rb
rename to actionpack/lib/action_dispatch/vendor/rack-1.0/rack/recursive.rb
diff --git a/actionpack/lib/action_controller/vendor/rack-1.0/rack/reloader.rb b/actionpack/lib/action_dispatch/vendor/rack-1.0/rack/reloader.rb
similarity index 100%
rename from actionpack/lib/action_controller/vendor/rack-1.0/rack/reloader.rb
rename to actionpack/lib/action_dispatch/vendor/rack-1.0/rack/reloader.rb
diff --git a/actionpack/lib/action_controller/vendor/rack-1.0/rack/request.rb b/actionpack/lib/action_dispatch/vendor/rack-1.0/rack/request.rb
similarity index 100%
rename from actionpack/lib/action_controller/vendor/rack-1.0/rack/request.rb
rename to actionpack/lib/action_dispatch/vendor/rack-1.0/rack/request.rb
diff --git a/actionpack/lib/action_controller/vendor/rack-1.0/rack/response.rb b/actionpack/lib/action_dispatch/vendor/rack-1.0/rack/response.rb
similarity index 100%
rename from actionpack/lib/action_controller/vendor/rack-1.0/rack/response.rb
rename to actionpack/lib/action_dispatch/vendor/rack-1.0/rack/response.rb
diff --git a/actionpack/lib/action_controller/vendor/rack-1.0/rack/session/abstract/id.rb b/actionpack/lib/action_dispatch/vendor/rack-1.0/rack/session/abstract/id.rb
similarity index 100%
rename from actionpack/lib/action_controller/vendor/rack-1.0/rack/session/abstract/id.rb
rename to actionpack/lib/action_dispatch/vendor/rack-1.0/rack/session/abstract/id.rb
diff --git a/actionpack/lib/action_controller/vendor/rack-1.0/rack/session/cookie.rb b/actionpack/lib/action_dispatch/vendor/rack-1.0/rack/session/cookie.rb
similarity index 100%
rename from actionpack/lib/action_controller/vendor/rack-1.0/rack/session/cookie.rb
rename to actionpack/lib/action_dispatch/vendor/rack-1.0/rack/session/cookie.rb
diff --git a/actionpack/lib/action_controller/vendor/rack-1.0/rack/session/memcache.rb b/actionpack/lib/action_dispatch/vendor/rack-1.0/rack/session/memcache.rb
similarity index 100%
rename from actionpack/lib/action_controller/vendor/rack-1.0/rack/session/memcache.rb
rename to actionpack/lib/action_dispatch/vendor/rack-1.0/rack/session/memcache.rb
diff --git a/actionpack/lib/action_controller/vendor/rack-1.0/rack/session/pool.rb b/actionpack/lib/action_dispatch/vendor/rack-1.0/rack/session/pool.rb
similarity index 100%
rename from actionpack/lib/action_controller/vendor/rack-1.0/rack/session/pool.rb
rename to actionpack/lib/action_dispatch/vendor/rack-1.0/rack/session/pool.rb
diff --git a/actionpack/lib/action_controller/vendor/rack-1.0/rack/showexceptions.rb b/actionpack/lib/action_dispatch/vendor/rack-1.0/rack/showexceptions.rb
similarity index 100%
rename from actionpack/lib/action_controller/vendor/rack-1.0/rack/showexceptions.rb
rename to actionpack/lib/action_dispatch/vendor/rack-1.0/rack/showexceptions.rb
diff --git a/actionpack/lib/action_controller/vendor/rack-1.0/rack/showstatus.rb b/actionpack/lib/action_dispatch/vendor/rack-1.0/rack/showstatus.rb
similarity index 100%
rename from actionpack/lib/action_controller/vendor/rack-1.0/rack/showstatus.rb
rename to actionpack/lib/action_dispatch/vendor/rack-1.0/rack/showstatus.rb
diff --git a/actionpack/lib/action_controller/vendor/rack-1.0/rack/static.rb b/actionpack/lib/action_dispatch/vendor/rack-1.0/rack/static.rb
similarity index 100%
rename from actionpack/lib/action_controller/vendor/rack-1.0/rack/static.rb
rename to actionpack/lib/action_dispatch/vendor/rack-1.0/rack/static.rb
diff --git a/actionpack/lib/action_controller/vendor/rack-1.0/rack/urlmap.rb b/actionpack/lib/action_dispatch/vendor/rack-1.0/rack/urlmap.rb
similarity index 100%
rename from actionpack/lib/action_controller/vendor/rack-1.0/rack/urlmap.rb
rename to actionpack/lib/action_dispatch/vendor/rack-1.0/rack/urlmap.rb
diff --git a/actionpack/lib/action_controller/vendor/rack-1.0/rack/utils.rb b/actionpack/lib/action_dispatch/vendor/rack-1.0/rack/utils.rb
similarity index 100%
rename from actionpack/lib/action_controller/vendor/rack-1.0/rack/utils.rb
rename to actionpack/lib/action_dispatch/vendor/rack-1.0/rack/utils.rb