diff --git a/ChangeLog b/ChangeLog
index 6c760de778..0785db1746 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Aug  7 13:28:32 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* common.mk (node_name.inc): use $? instead of $< for nmake.
+	  [ruby-dev:31356]
+
 Tue Aug  7 12:45:13 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* configure.in (ac_cv_func_isinf): set yes also on OpenSolaris.
diff --git a/common.mk b/common.mk
index 2921c2a30d..eef59e462f 100644
--- a/common.mk
+++ b/common.mk
@@ -615,7 +615,7 @@ vm.inc: $(srcdir)/template/vm.inc.tmpl
 incs: $(INSNS) node_name.inc
 
 node_name.inc: {$(VPATH)}node.h
-	$(BASERUBY) -n $(srcdir)/tool/node_name.rb $< > $@
+	$(BASERUBY) -n $(srcdir)/tool/node_name.rb $? > $@
 
 docs:
 	$(BASERUBY) -I$(srcdir) $(srcdir)/tool/makedocs.rb $(INSNS2VMOPT)