diff --git a/ChangeLog b/ChangeLog
index 996358931f..11e1acfc17 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Jan  7 19:11:30 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (Init_String): sym_match arity spec was wrong.  a patch
+	  from Hiroyuki Iwatsuki <don at na.rim.or.jp> in [ruby-dev:32957].
+
 Mon Jan  7 18:10:33 2008  Tanaka Akira  <akr@fsij.org>
 
 	* string.c (str_gsub): move rb_enc_get(str) to out of loop.
diff --git a/bootstraptest/test_knownbug.rb b/bootstraptest/test_knownbug.rb
index 9f770a786b..56ca4d40e3 100644
--- a/bootstraptest/test_knownbug.rb
+++ b/bootstraptest/test_knownbug.rb
@@ -83,7 +83,7 @@ assert_equal 'ok', %q{
      end
   end
 
-  M::A.eval_str(<<END)
+  M::A.eval_str(<<-END)
   workflow_rule do |r|
      r.at 1
   end
diff --git a/string.c b/string.c
index d7a22ec1f4..4a11648a03 100644
--- a/string.c
+++ b/string.c
@@ -5975,7 +5975,7 @@ Init_String(void)
     rb_define_method(rb_cSymbol, "length", sym_length, 0);
     rb_define_method(rb_cSymbol, "size", sym_length, 0);
     rb_define_method(rb_cSymbol, "empty?", sym_empty, 0);
-    rb_define_method(rb_cSymbol, "match", sym_match, -1);
+    rb_define_method(rb_cSymbol, "match", sym_match, 1);
 
     rb_define_method(rb_cSymbol, "upcase", sym_upcase, 0);
     rb_define_method(rb_cSymbol, "downcase", sym_downcase, 0);