diff --git a/ChangeLog b/ChangeLog
index 9d5ec377d1..f2bbba8eac 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Jun 21 01:40:25 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (reswords): modifier token is no longer returned in fname
+	  state.  fixed: [ruby-dev:28775]
+
 Tue Jun 20 23:28:34 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* ext/extmk.rb (parse_args): provisional catch-up for the recent changes.
diff --git a/parse.y b/parse.y
index c542b35b75..7fc86e1987 100644
--- a/parse.y
+++ b/parse.y
@@ -1655,7 +1655,7 @@ reswords	: k__LINE__ | k__FILE__ | klBEGIN | klEND
 		| kFOR | kIN | kMODULE | kNEXT | kNIL | kNOT
 		| kOR | kREDO | kRESCUE | kRETRY | kRETURN | kSELF | kSUPER
 		| kTHEN | kTRUE | kUNDEF | kWHEN | kYIELD
-		| kIF_MOD | kUNLESS_MOD | kWHILE_MOD | kUNTIL_MOD | kRESCUE_MOD
+		| kIF | kUNLESS | kWHILE | kUNTIL
 		;
 
 arg		: lhs '=' arg