diff --git a/Makefile.in b/Makefile.in
index 6d8e8023b..3a4675647 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -588,7 +588,7 @@ iana_update:
 DEPEND_TMP=depend1073.tmp
 DEPEND_TMP2=depend1074.tmp
 DEPEND_TARGET=Makefile
-DEPEND_TARGET2=Makefile.in
+DEPEND_TARGET2=$(srcdir)/Makefile.in
 # actions: generate deplines from gcc,
 # then, filter out home/xx, /usr/xx and /opt/xx lines (some cc already do this)
 # then, remove empty " \" lines
@@ -596,7 +596,8 @@ DEPEND_TARGET2=Makefile.in
 # then, remove srcdir from the (generated) parser and lexer.
 # and mention the .lo
 depend:
-	(cd $(srcdir) ; $(CC) $(DEPFLAG) $(CPPFLAGS) $(CFLAGS) @PTHREAD_CFLAGS_ONLY@ $(ALL_SRC) $(COMPAT_SRC)) | \
+	(BUILDDIR=$$PWD; cd $(srcdir) ; $(CC) $(DEPFLAG) $(CPPFLAGS) $(CFLAGS) -I$$BUILDDIR @PTHREAD_CFLAGS_ONLY@ $(ALL_SRC) $(COMPAT_SRC)) | \
+		sed -e 's?'$$PWD'/config.h?config.h?g' | \
 		sed -e 's!'$$HOME'[^ ]* !!g' -e 's!'$$HOME'[^ ]*$$!!g' \
 			-e 's!/usr[^ ]* !!g' -e 's!/usr[^ ]*$$!!g' \
 			-e 's!/opt[^ ]* !!g' -e 's!/opt[^ ]*$$!!g' | \
diff --git a/doc/Changelog b/doc/Changelog
index 19911b433..e97d0ebaf 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -10,8 +10,9 @@
 	  and implement option in client responses.
 	- Correct and expand manual page entries for keepalive and idle timeout.
 	- Implement progressive backoff of TCP idle/keepalive timeout.
+	- Fix 'make depend' to work when build dir is not project root.
 	- From Wouter: make depend, the dependencies in the patches did not
-	  apply cleanly.
+	  apply cleanly.  Also remade yacc and lex.
 	- Fix mesh.c incompatible pointer pass.
 
 30 July 2018: Wouter