2 files changed, 7 insertions, 3 deletions
diff --git a/actionpack/lib/action_controller.rb b/actionpack/lib/action_controller.rb
index 51db64bf44..340f41163d 100755
--- a/actionpack/lib/action_controller.rb
+++ b/actionpack/lib/action_controller.rb
@@ -26,8 +26,12 @@ $:.unshift(File.dirname(__FILE__))
 begin
   require 'active_support'
 rescue LoadError
-  require 'rubygems'
-  require_gem 'activesupport'
+  begin
+    require File.dirname(__FILE__) + '/../../activesupport/lib/active_support'
+  rescue LoadError
+    require 'rubygems'
+    require_gem 'activesupport'
+  end
 end
 
 require 'action_controller/base'
diff --git a/actionpack/lib/action_view.rb b/actionpack/lib/action_view.rb
index 4caf9d8236..d2a54da15e 100644
--- a/actionpack/lib/action_view.rb
+++ b/actionpack/lib/action_view.rb
@@ -22,7 +22,7 @@
 #++
 
 begin
-  require 'rubygems'	
+  require 'rubygems'
   require 'builder'
 rescue LoadError
   # RubyGems is not available, use included Builder