diff --git a/ChangeLog b/ChangeLog
index 1ce414c861..92a6eb1a50 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sat Feb 24 16:51:09 2007  Minero Aoki  <aamine@loveruby.net>
+
+	* bootstraptest/runner.rb: new option --help.
+
 Sat Feb 24 16:47:33 2007  Minero Aoki  <aamine@loveruby.net>
 
 	* bootstraptest: new test suite.
diff --git a/bootstraptest/runner.rb b/bootstraptest/runner.rb
index d48d14e6e6..d5934d0fe7 100644
--- a/bootstraptest/runner.rb
+++ b/bootstraptest/runner.rb
@@ -20,6 +20,13 @@ def main
       tests = Dir.glob("#{File.dirname($0)}/test_{#{$1}}*.rb")
       puts tests.map {|path| File.basename(path) }.inspect
       true
+    when /\A(-h|--h(elp)?\z/
+      puts(<<-End)
+Usage: #{File.basename($0, '.*')} --ruby=PATH [--sets=NAME,NAME,...]
+    --sets=NAME,NAME,...        Name of test sets.
+    --help                      Print this message and quit.
+End
+      exit 0
     else
       false
     end