diff --git a/ChangeLog b/ChangeLog
index 931510ae48..bba4a953a9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Thu Jul  7 06:19:38 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems.rb:  Reduce requires to improve `make benchmark`.
+	  [#4962]
+	* lib/rubygems/specification.rb:  Delay initialization of rubygems
+	  until require is called.
+
 Thu Jul  7 04:31:26 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* parse.y (arg): rescue_mod is in inverse order from other
diff --git a/lib/rubygems.rb b/lib/rubygems.rb
index 0f3a07329e..25d8bc4e01 100644
--- a/lib/rubygems.rb
+++ b/lib/rubygems.rb
@@ -32,8 +32,6 @@ if Gem::GEM_PRELUDE_SUCKAGE and defined?(Gem::QuickLoader) then
 end
 
 require 'rubygems/defaults'
-require "rubygems/dependency_list"
-require 'rubygems/path_support'
 require 'rbconfig'
 require "rubygems/deprecate"
 
@@ -126,7 +124,7 @@ require "rubygems/deprecate"
 # -The RubyGems Team
 
 module Gem
-  VERSION = '1.8.5'
+  VERSION = '1.8.5.1'
 
   ##
   # Raised when RubyGems is unable to load or activate a gem.  Contains the
@@ -1142,11 +1140,13 @@ module Gem
   autoload :Version,         'rubygems/version'
   autoload :Requirement,     'rubygems/requirement'
   autoload :Dependency,      'rubygems/dependency'
+  autoload :DependencyList,  'rubygems/dependency_list'
   autoload :GemPathSearcher, 'rubygems/gem_path_searcher'
   autoload :SpecFetcher,     'rubygems/spec_fetcher'
   autoload :Specification,   'rubygems/specification'
   autoload :Cache,           'rubygems/source_index'
   autoload :SourceIndex,     'rubygems/source_index'
+  autoload :PathSupport,     'rubygems/path_support'
   autoload :Platform,        'rubygems/platform'
   autoload :Builder,         'rubygems/builder'
   autoload :ConfigFile,      'rubygems/config_file'
@@ -1238,8 +1238,6 @@ end
 
 require 'rubygems/custom_require'
 
-Gem.clear_paths
-
 module Gem
   class << self
     extend Deprecate
diff --git a/lib/rubygems/specification.rb b/lib/rubygems/specification.rb
index 0d3cb4e0cc..f0119c99ba 100644
--- a/lib/rubygems/specification.rb
+++ b/lib/rubygems/specification.rb
@@ -2126,3 +2126,6 @@ class Gem::Specification
   # deprecate :file_name,           :cache_file, 2011, 10
   # deprecate :full_gem_path,     :cache_file, 2011, 10
 end
+
+Gem.clear_paths
+