diff --git a/ChangeLog b/ChangeLog
index 3db38f95d2..13c7c01c5d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Jan 19 21:00:34 2008  Tanaka Akira  <akr@fsij.org>
+
+	* lib/rdoc/template.rb (RDoc): defined to avoid uninitialized constant
+	  error by `./ruby test/rubygems/test_gem_server.rb'.
+
 Sat Jan 19 20:41:29 2008  Tanaka Akira  <akr@fsij.org>
 
 	* encoding.c (enc_new): don't free rb_encoding to avoid SEGV by
diff --git a/lib/rdoc/template.rb b/lib/rdoc/template.rb
index 368a5539d6..aa35927c8b 100644
--- a/lib/rdoc/template.rb
+++ b/lib/rdoc/template.rb
@@ -24,6 +24,8 @@ require 'erb'
 #
 # So you can see what is being used inside which loop.
 
+module RDoc
+end
 class RDoc::TemplatePage
 
   ##