diff --git a/ChangeLog b/ChangeLog
index 33642509bb..9e78d1031b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Dec 24 10:37:38 2007  Eric Hodel  <drbrain@segment7.net>
+
+	* gem_prelude.rb:  Remove methods from Gem, not QuickLoader, to fix
+	warnings.
+
 Mon Dec 24 09:45:45 2007  Martin Duerst  <duerst@it.aoyama.ac.jp>
 
 	* transcode.c, transcode_data_one_byte.c, transcode_data_japanese.c:
diff --git a/gem_prelude.rb b/gem_prelude.rb
index 93199b7239..63f979ccab 100644
--- a/gem_prelude.rb
+++ b/gem_prelude.rb
@@ -79,10 +79,14 @@ module Gem
 
     class << self
       def load_full_rubygems_library
-        QuickLoader.instance_methods.each do |method_name|
-          QuickLoader.send :undef_method, method_name
+        class << Gem
+          Gem.methods(false).each do |method_name|
+            undef_method method_name
+          end
         end
 
+        Kernel.send :undef_method, :gem
+
         $".delete File.join(Gem::ConfigMap[:libdir], 'ruby',
                             Gem::ConfigMap[:ruby_version], 'rubygems.rb')