diff --git a/ChangeLog b/ChangeLog
index e3288b4682..2806fbc4d9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Tue Aug  8 23:49:06 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/irb/extend-command.rb (IRB::ExtendCommandBundle): pacify
+	  RDoc.  a patch from Eric Hodel <drbrain at segment7.net>.
+	  [ruby-core:08522]
+
 Tue Aug  8 11:32:54 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* Makefile.in, common.mk, configure.in: fix for platforms without
diff --git a/README b/README
index bde22dff78..d4580076b0 100644
--- a/README
+++ b/README
@@ -62,7 +62,7 @@ This is what you need to do to compile and install Ruby:
 
   2. Run ./configure, which will generate config.h and Makefile.
 
-  3. Edit defines.h if you need.  Probably this step will not need.
+  3. Edit defines.h if you need.  Usually this step will not be needed.
 
   4. Remove comment mark(#) before the module names from ext/Setup (or
      add module names if not present), if you want to link modules
diff --git a/lib/irb/extend-command.rb b/lib/irb/extend-command.rb
index c330d1bd3b..8994f2f8d2 100644
--- a/lib/irb/extend-command.rb
+++ b/lib/irb/extend-command.rb
@@ -106,14 +106,14 @@ module IRB
 
     ]
 
-    def EXCB.install_extend_commands
+    def self.install_extend_commands
       for args in @EXTEND_COMMANDS
 	def_extend_command(*args)
       end
     end
 
     # aliases = [commans_alias, flag], ...
-    def EXCB.def_extend_command(cmd_name, cmd_class, load_file = nil, *aliases)
+    def self.def_extend_command(cmd_name, cmd_class, load_file = nil, *aliases)
       case cmd_class
       when Symbol
 	cmd_class = cmd_class.id2name
@@ -172,7 +172,7 @@ module IRB
       "irb_" + method_name + "_org"
     end
 
-    def EXCB.extend_object(obj)
+    def self.extend_object(obj)
       unless (class<<obj;ancestors;end).include?(EXCB)
 	super
 	for ali, com, flg in @ALIASES
@@ -196,13 +196,13 @@ module IRB
       [:save_history=, "irb/ext/save-history.rb"],
     ]
 
-    def CE.install_extend_commands
+    def self.install_extend_commands
       for args in @EXTEND_COMMANDS
 	def_extend_command(*args)
       end
     end
 
-    def CE.def_extend_command(cmd_name, load_file, *aliases)
+    def self.def_extend_command(cmd_name, load_file, *aliases)
       Context.module_eval %[
         def #{cmd_name}(*opts, &b)
 	  Context.module_eval {remove_method(:#{cmd_name})}