diff --git a/ChangeLog b/ChangeLog
index 63461f64a5..ede4591c48 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Oct 24 17:43:26 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (lambda): need to adjust lpar_beg for ripper as well.  
+	  [ruby-dev:36702]
+
 Fri Oct 24 16:13:12 2008  Takeyuki FUJIOKA  <xibbar@ruby-lang.org>
 
 	* lib/cgi/core.rb (read_multipart): change field value as String
diff --git a/parse.y b/parse.y
index 3f85c07b09..d9f19295ba 100644
--- a/parse.y
+++ b/parse.y
@@ -3426,19 +3426,19 @@ bvar		: tIDENTIFIER
 lambda		:   {
 		    /*%%%*/
 			dyna_push();
+		    /*%
 			$<num>$ = lpar_beg;
 			lpar_beg = ++paren_nest;
-		    /*%
 		    %*/
 		    }
 		  f_larglist
 		  lambda_body
 		    {
+			lpar_beg = $<num>1;
 		    /*%%%*/
 			$$ = $2;
 			$$->nd_body = NEW_SCOPE($2->nd_head, $3);
 			dyna_pop();
-			lpar_beg = $<num>1;
 		    /*%
 			$$ = dispatch2(lambda, $2, $3);
 		    %*/