diff --git a/ChangeLog b/ChangeLog
index 972903351c..a946be29da 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Jul 21 21:37:19 2009  Keiju Ishitsuka  <keiju@emperor2.pendome>
+
+	* lib/irb/cmd/help.rb: fixed irb's "help" command. [ruby-core:22310].
+
 Tue Jul 21 20:41:20 2009  Keiju Ishitsuka  <keiju@emperor2.pendome>
 
 	* lib/tracer.rb: no show lines unkonwn line number. [ruby-core:22096],
diff --git a/lib/irb/cmd/help.rb b/lib/irb/cmd/help.rb
index de3c6bd6bf..d2d6ef4083 100644
--- a/lib/irb/cmd/help.rb
+++ b/lib/irb/cmd/help.rb
@@ -11,17 +11,19 @@
 require 'rdoc/ri/driver'
 require 'rdoc/ri/util'
 
+require "irb/cmd/nop.rb"
+
 module IRB
   module ExtendCommand
-    module Help
+    class Help<Nop
       begin
-        @ri = RDoc::RI::Driver.new
+        Ri = RDoc::RI::Driver.new
       rescue SystemExit
       else
-        def self.execute(context, *names)
+        def execute(*names)
           names.each do |name|
             begin
-              @ri.get_info_for(name.to_s)
+              Ri.get_info_for(name.to_s)
             rescue RDoc::RI::Error
               puts $!.message
             end