diff --git a/ChangeLog b/ChangeLog
index 4f966e73ad..aaf79fdb6b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Dec 24 16:13:05 2015  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* common.mk (ripper.c): r50045 wrongly replace $(PWD) with ../..
+	  It is the top of build directory, not topsrcdir.
+
 Thu Dec 24 15:02:42 2015  sorah (Shota Fukumori)  <her@sorah.jp>
 
 	* tool/vcs.rb (IO.popen): Refactor. Avoid assigning in condition.
diff --git a/common.mk b/common.mk
index 75892d5f67..c2bedb7902 100644
--- a/common.mk
+++ b/common.mk
@@ -872,7 +872,7 @@ $(srcdir)/ext/ripper/ripper.c: parse.y id.h
 	$(Q) $(CHDIR) $(@D) && \
 	sed /AUTOGENERATED/q depend | \
 	$(exec) $(MAKE) -f - $(MFLAGS) \
-		Q=$(Q) ECHO=$(ECHO) RM="$(RM)" top_srcdir=../.. srcdir=. VPATH=../.. \
+		Q=$(Q) ECHO=$(ECHO) RM="$(RM)" top_srcdir=../.. srcdir=. VPATH="$(PWD)" \
 		RUBY="$(BASERUBY)" PATH_SEPARATOR="$(PATH_SEPARATOR)"
 
 $(srcdir)/ext/json/parser/parser.c: $(srcdir)/ext/json/parser/parser.rl