diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG
index c8106f0df81196250b00c56de2f440e9f900d15b..a5d1d2a77129523364c3b64bcfeae68e9cb6c384 100644
--- a/actionpack/CHANGELOG
+++ b/actionpack/CHANGELOG
@@ -1,5 +1,7 @@
 *SVN*
 
+* Don't search a load-path of '.' for controller files [Jamis Buck]
+
 * Update integration.rb to require test_process explicitly instead of via Dependencies. [Nicholas Seckar]
 
 * Fixed that you can still access the flash after the flash has been reset in reset_session.  Closes #5584 [lmarlow@yahoo.com]
diff --git a/actionpack/lib/action_controller/routing.rb b/actionpack/lib/action_controller/routing.rb
index a91019d418f8774b9ceb407a5f8c4cb6333b9e14..835758675e608221bf486c8b4a42cd2793d59d09 100644
--- a/actionpack/lib/action_controller/routing.rb
+++ b/actionpack/lib/action_controller/routing.rb
@@ -80,7 +80,7 @@ def possible_controllers
         unless @possible_controllers
           @possible_controllers = []
         
-          paths = $LOAD_PATH.select { |path| File.directory? path }
+          paths = $LOAD_PATH.select { |path| File.directory?(path) && path != "." }
 
           seen_paths = Hash.new {|h, k| h[k] = true; false}
           normalize_paths(paths).each do |load_path|