diff --git a/ChangeLog b/ChangeLog
index cccae44df3..54b0a5a870 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,11 @@ Sat Oct 18 14:40:32 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* numeric.c (num_sadded): remove newly defined singleton method
 	  that should not exist after exception handling.  [ruby-dev:36569]
 
+Sat Oct 18 14:27:49 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (opt_block_arg): allow trailing comma after usual
+	  arguments.  not after block argument.
+
 Sat Oct 18 13:30:53 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* string.c (rb_external_str_new): a new function to convert from
diff --git a/parse.y b/parse.y
index 58283dceb2..da63620f49 100644
--- a/parse.y
+++ b/parse.y
@@ -2399,6 +2399,10 @@ opt_block_arg	: ',' block_arg
 		    {
 			$$ = $2;
 		    }
+		| ','
+		    {
+			$$ = 0;
+		    }
 		| none
 		    {
 			$$ = 0;