diff --git a/ChangeLog b/ChangeLog
index 48b18f8644..d8c7b6e8bf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,11 @@ Fri Jun 27 17:45:17 2008  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
 
 	* test/erb/test_erb.rb: add tests for def_method.
 
+Fri Jun 27 14:29:07 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (primary): empty not should call '!' on nil.
+	  cf [ruby-dev:35227]
+
 Fri Jun 27 14:25:52 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* vm.c (vm_eval_body): if thrown exception is frozen, reraise it to
diff --git a/parse.y b/parse.y
index bfc8cd9823..0970cc43e9 100644
--- a/parse.y
+++ b/parse.y
@@ -2624,7 +2624,7 @@ primary		: literal
 		| keyword_not '(' rparen
 		    {
 		    /*%%%*/
-			$$ = NEW_LIT(Qtrue);
+			$$ = call_uni_op(cond(NEW_NIL()), '!');
 		    /*%
 			$$ = dispatch2(unary, ripper_intern("not"), Qnil);
 		    %*/