diff --git a/actionpack/README.rdoc b/actionpack/README.rdoc
index fc36423f8326cea4fecd39c7de56dcf1200b44e2..076a93bbcd22dea2e5c999d600ec5b7c766d3130 100644
--- a/actionpack/README.rdoc
+++ b/actionpack/README.rdoc
@@ -206,7 +206,7 @@ A short rundown of some of the major features:
 
     You specify a logger through a class method, such as:
 
-    ActionController::Base.logger = Logger.new("Application Log")
+    ActionController::Base.logger = ActiveSupport::Logger.new("Application Log")
     ActionController::Base.logger = Log4r::Logger.new("Application Log")
 
 
diff --git a/actionpack/test/controller/content_type_test.rb b/actionpack/test/controller/content_type_test.rb
index d51882066d602a0b698ca3fc0e4ec54f058e297a..a312b7c32aa00cb684274418c29e2a742bee645c 100644
--- a/actionpack/test/controller/content_type_test.rb
+++ b/actionpack/test/controller/content_type_test.rb
@@ -59,7 +59,7 @@ def setup
     super
     # enable a logger so that (e.g.) the benchmarking stuff runs, so we can get
     # a more accurate simulation of what happens in "real life".
-    @controller.logger = Logger.new(nil)
+    @controller.logger = ActiveSupport::Logger.new(nil)
   end
 
   # :ported:
diff --git a/actionpack/test/controller/new_base/render_streaming_test.rb b/actionpack/test/controller/new_base/render_streaming_test.rb
index 1532bd5c98e889477277ed8b47c7e7196441b63a..61ea68e3f79ed1190f82c1c147f39dcc1c634537 100644
--- a/actionpack/test/controller/new_base/render_streaming_test.rb
+++ b/actionpack/test/controller/new_base/render_streaming_test.rb
@@ -85,7 +85,7 @@ class StreamingTest < Rack::TestCase
 
     test "rendering with template exception logs the exception" do
       io = StringIO.new
-      _old, ActionController::Base.logger = ActionController::Base.logger, Logger.new(io)
+      _old, ActionController::Base.logger = ActionController::Base.logger, ActiveSupport::Logger.new(io)
 
       begin
         get "/render_streaming/basic/template_exception"
diff --git a/actionpack/test/controller/render_test.rb b/actionpack/test/controller/render_test.rb
index 768cfb34acc88084e9aa10dff6dd413f0907a1eb..ec26315dc7822e75e342add355645fd812af0e72 100644
--- a/actionpack/test/controller/render_test.rb
+++ b/actionpack/test/controller/render_test.rb
@@ -696,7 +696,7 @@ def setup
     # enable a logger so that (e.g.) the benchmarking stuff runs, so we can get
     # a more accurate simulation of what happens in "real life".
     super
-    @controller.logger = Logger.new(nil)
+    @controller.logger = ActiveSupport::Logger.new(nil)
 
     @request.host = "www.nextangle.com"
   end
@@ -907,7 +907,7 @@ def test_access_to_request_in_view
 
   def test_access_to_logger_in_view
     get :accessing_logger_in_template
-    assert_equal "Logger", @response.body
+    assert_equal "ActiveSupport::Logger", @response.body
   end
 
   # :ported:
diff --git a/actionpack/test/controller/render_xml_test.rb b/actionpack/test/controller/render_xml_test.rb
index ec4dc848ff4cecdfbc9472e9dc2c6fdc61068e96..8b4f2f5349950a5cf769077d984e469a806e8586 100644
--- a/actionpack/test/controller/render_xml_test.rb
+++ b/actionpack/test/controller/render_xml_test.rb
@@ -48,7 +48,7 @@ def setup
     # enable a logger so that (e.g.) the benchmarking stuff runs, so we can get
     # a more accurate simulation of what happens in "real life".
     super
-    @controller.logger = Logger.new(nil)
+    @controller.logger = ActiveSupport::Logger.new(nil)
 
     @request.host = "www.nextangle.com"
   end
diff --git a/actionpack/test/dispatch/request/json_params_parsing_test.rb b/actionpack/test/dispatch/request/json_params_parsing_test.rb
index ad44b4b16a263b350c485ae662956f023ed283e2..ae425dd406f4bc0a3575f70137dcaf86541b1fff 100644
--- a/actionpack/test/dispatch/request/json_params_parsing_test.rb
+++ b/actionpack/test/dispatch/request/json_params_parsing_test.rb
@@ -34,7 +34,7 @@ def teardown
     with_test_routing do
       output = StringIO.new
       json = "[\"person]\": {\"name\": \"David\"}}"
-      post "/parse", json, {'CONTENT_TYPE' => 'application/json', 'action_dispatch.show_exceptions' => true, 'action_dispatch.logger' => Logger.new(output)}
+      post "/parse", json, {'CONTENT_TYPE' => 'application/json', 'action_dispatch.show_exceptions' => true, 'action_dispatch.logger' => ActiveSupport::Logger.new(output)}
       assert_response :error
       output.rewind && err = output.read
       assert err =~ /Error occurred while parsing request parameters/
diff --git a/actionpack/test/dispatch/request/xml_params_parsing_test.rb b/actionpack/test/dispatch/request/xml_params_parsing_test.rb
index 0984f0006671d8004a1d456bc344de96792f9d91..afd400c2a9dfa41da343bb3078b8158ab2551e3d 100644
--- a/actionpack/test/dispatch/request/xml_params_parsing_test.rb
+++ b/actionpack/test/dispatch/request/xml_params_parsing_test.rb
@@ -56,7 +56,7 @@ def call(env)
     with_test_routing do
       output = StringIO.new
       xml = "<person><name>David</name><avatar type='file' name='me.jpg' content_type='image/jpg'>#{::Base64.encode64('ABC')}</avatar></pineapple>"
-      post "/parse", xml, default_headers.merge('action_dispatch.show_exceptions' => true, 'action_dispatch.logger' => Logger.new(output))
+      post "/parse", xml, default_headers.merge('action_dispatch.show_exceptions' => true, 'action_dispatch.logger' => ActiveSupport::Logger.new(output))
       assert_response :error
       output.rewind && err = output.read
       assert err =~ /Error occurred while parsing request parameters/
diff --git a/actionpack/test/template/template_test.rb b/actionpack/test/template/template_test.rb
index f9c228f0c380762823d538a59b1e7d5dbbebe8ae..3084527f7003163c726d585c7c96f05981eddc1b 100644
--- a/actionpack/test/template/template_test.rb
+++ b/actionpack/test/template/template_test.rb
@@ -37,7 +37,7 @@ def lookup_context
     end
 
     def logger
-      Logger.new(STDERR)
+      ActiveSupport::Logger.new(STDERR)
     end
 
     def my_buffer
diff --git a/activerecord/README.rdoc b/activerecord/README.rdoc
index 6f9f63ceee8369bea1785dfc1323f78bb282c659..30a66ff5f0112953caf057266441e61fc957bb12 100644
--- a/activerecord/README.rdoc
+++ b/activerecord/README.rdoc
@@ -143,7 +143,7 @@ A short rundown of some of the major features:
 
 * Logging support for Log4r[http://log4r.sourceforge.net] and Logger[http://www.ruby-doc.org/stdlib/libdoc/logger/rdoc].
 
-    ActiveRecord::Base.logger = Logger.new(STDOUT)
+    ActiveRecord::Base.logger = ActiveSupport::Logger.new(STDOUT)
     ActiveRecord::Base.logger = Log4r::Logger.new("Application Log")
 
 
diff --git a/activerecord/lib/active_record/railtie.rb b/activerecord/lib/active_record/railtie.rb
index 165d0750ddd54e79bf250281ebc614d13214cae6..b1c8ae5b77abc489daa66743b62482a77bbabf11 100644
--- a/activerecord/lib/active_record/railtie.rb
+++ b/activerecord/lib/active_record/railtie.rb
@@ -38,7 +38,7 @@ class Railtie < Rails::Railtie
     # first time. Also, make it output to STDERR.
     console do |app|
       require "active_record/railties/console_sandbox" if app.sandbox?
-      ActiveRecord::Base.logger = Logger.new(STDERR)
+      ActiveRecord::Base.logger = ActiveSupport::Logger.new(STDERR)
     end
 
     initializer "active_record.initialize_timezone" do
diff --git a/activeresource/test/abstract_unit.rb b/activeresource/test/abstract_unit.rb
index 9c1e9a526df4d444cdb094e6b524f012ecc118ba..38df58399070c66e47b7400cc60a750e85ad3bce 100644
--- a/activeresource/test/abstract_unit.rb
+++ b/activeresource/test/abstract_unit.rb
@@ -7,11 +7,10 @@
 require 'active_resource'
 require 'active_support'
 require 'active_support/test_case'
-
 require 'setter_trap'
+require 'active_support/logger'
 
-require 'logger'
-ActiveResource::Base.logger = Logger.new("#{File.dirname(__FILE__)}/debug.log")
+ActiveResource::Base.logger = ActiveSupport::Logger.new("#{File.dirname(__FILE__)}/debug.log")
 
 def setup_response
   matz_hash = { 'person' => { :id => 1, :name => 'Matz' } }
diff --git a/activesupport/test/buffered_logger_test.rb b/activesupport/test/buffered_logger_test.rb
index b9891c74c82680c4ada5c85fa447cfcfebda5b80..4ed425732a14c70d1aa67e0462a927819f13a96f 100644
--- a/activesupport/test/buffered_logger_test.rb
+++ b/activesupport/test/buffered_logger_test.rb
@@ -3,7 +3,6 @@
 require 'stringio'
 require 'fileutils'
 require 'tempfile'
-require 'active_support/buffered_logger'
 require 'active_support/testing/deprecation'
 
 class BufferedLoggerTest < Test::Unit::TestCase
diff --git a/activesupport/test/caching_test.rb b/activesupport/test/caching_test.rb
index aa6fb14e7b112fca346af4f795b311912d3aa405..3454c378d3ba3e4008b26b015fe2a90f2ac8b033 100644
--- a/activesupport/test/caching_test.rb
+++ b/activesupport/test/caching_test.rb
@@ -681,7 +681,7 @@ def setup
       @data = @cache.instance_variable_get(:@data)
       @cache.clear
       @cache.silence!
-      @cache.logger = Logger.new("/dev/null")
+      @cache.logger = ActiveSupport::Logger.new("/dev/null")
     end
 
     include CacheStoreBehavior
@@ -786,7 +786,7 @@ def setup
     @cache = ActiveSupport::Cache.lookup_store(:memory_store)
 
     @buffer = StringIO.new
-    @cache.logger = Logger.new(@buffer)
+    @cache.logger = ActiveSupport::Logger.new(@buffer)
   end
 
   def test_logging