diff --git a/ChangeLog b/ChangeLog
index baf7242ef9..519752c68b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Wed Nov 14 02:50:43 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* common.mk (parse.c): dependency also needs vpath.
+
+	* common.mk (node_name.inc, prelude.c): VPATH in nmake does not
+	  work for targets of explicit rules.
+
 Wed Nov 14 02:11:38 2007  Tanaka Akira  <akr@fsij.org>
 
 	* missing/isinf.c (isinf): don't define if the macro is defined.
diff --git a/common.mk b/common.mk
index db2288c5b7..7a85fb980a 100644
--- a/common.mk
+++ b/common.mk
@@ -349,9 +349,9 @@ $(RBCONFIG): $(srcdir)/mkconfig.rb config.status $(PREP)
 
 PHONY:
 
-{$(VPATH)}parse.c: parse.y
+{$(VPATH)}parse.c: {$(VPATH)}parse.y
 
-{$(VPATH)}.y.c:
+{$(srcdir)}.y.c:
 	$(YACC) $(YFLAGS) -o y.tab.c $<
 	sed -f $(srcdir)/tool/ytab.sed -e "/^#/s!y\.tab\.c!$@!" y.tab.c > $@
 	@$(RM) y.tab.c
@@ -633,10 +633,10 @@ vm.inc: $(srcdir)/template/vm.inc.tmpl
 
 incs: $(INSNS) node_name.inc
 
-{$(VPATH)}node_name.inc: {$(VPATH)}node.h
+node_name.inc: {$(VPATH)}node.h
 	$(BASERUBY) -n $(srcdir)/tool/node_name.rb $? > $@
 
-{$(VPATH)}prelude.c: $(srcdir)/tool/compile_prelude.rb $(srcdir)/prelude.rb
+prelude.c: $(srcdir)/tool/compile_prelude.rb $(srcdir)/prelude.rb
 	$(BASERUBY) $(srcdir)/tool/compile_prelude.rb $(srcdir)/prelude.rb $@
 
 ext_prelude.c: $(srcdir)/tool/compile_prelude.rb $(srcdir)/prelude.rb $(srcdir)/gem_prelude.rb $(RBCONFIG)