diff --git a/ChangeLog b/ChangeLog
index 7a55269f82..03122c71c9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed May  2 23:21:20 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (parser_yylex): allow spaces between lambda arrow and
+	  parenthesis.  [ruby-dev:45605][Feature #6390]
+
 Wed May  2 19:06:30 2012  Ayumu AIZAWA  <ayumu.aizawa@gmail.com>
 
 	* cont.c (rb_fiber_m_transfer): Improved Fiber documentation.
diff --git a/parse.y b/parse.y
index 1a5e9bc7fa..ede3a3efb2 100644
--- a/parse.y
+++ b/parse.y
@@ -7294,7 +7294,7 @@ parser_yylex(struct parser_params *parser)
 	    return tOP_ASGN;
 	}
 	if (c == '>') {
-	    lex_state = EXPR_ARG;
+	    lex_state = EXPR_ENDFN;
 	    return tLAMBDA;
 	}
 	if (IS_BEG() || (IS_SPCARG(c) && arg_ambiguous())) {
diff --git a/test/ruby/test_syntax.rb b/test/ruby/test_syntax.rb
index 55655e2e11..112ad6d052 100644
--- a/test/ruby/test_syntax.rb
+++ b/test/ruby/test_syntax.rb
@@ -166,6 +166,11 @@ class TestSyntax < Test::Unit::TestCase
     }
   end
 
+  def test_lambda_with_space
+    feature6390 = '[ruby-dev:45605]'
+    assert_valid_syntax("-> (x, y) {}", __FILE__, feature6390)
+  end
+
   private
 
   def not_label(x) @result = x; @not_label ||= nil end