diff --git a/ChangeLog b/ChangeLog
index 03c45607b1..d67d742ff5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,6 @@
-Sat Jan 15 10:00:07 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sat Jan 15 10:04:14 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ruby.c (process_options): autoload rubygems.
 
 	* tool/compile_prelude.rb (Prelude#initialize): ignore empty
 	  preludes.
diff --git a/gem_prelude.rb b/gem_prelude.rb
index 3d4516f341..e69de29bb2 100644
--- a/gem_prelude.rb
+++ b/gem_prelude.rb
@@ -1 +0,0 @@
-require 'rubygems.rb' if defined?(Gem)
diff --git a/ruby.c b/ruby.c
index 61a293e57e..b4d0bddf07 100644
--- a/ruby.c
+++ b/ruby.c
@@ -1365,7 +1365,7 @@ process_options(int argc, char **argv, struct cmdline_options *opt)
 	}
     }
     if (!(opt->disable & DISABLE_BIT(gems))) {
-	rb_define_module("Gem");
+	rb_autoload(rb_cObject, rb_intern("Gem"), "rubygems");
     }
     ruby_init_prelude();
     ruby_set_argv(argc, argv);