diff --git a/Makefile b/Makefile
index 3ac68c28..ca451487 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
-path_to_top=.
--include $(path_to_top)/Makefile.config
+top_builddir=.
+-include $(top_builddir)/Makefile.config
 
 SUBDIRS = doc po src
 CLEAN	= features.log
diff --git a/Makefile.config.in b/Makefile.config.in
index 2492f63b..56da64c5 100644
--- a/Makefile.config.in
+++ b/Makefile.config.in
@@ -6,15 +6,14 @@
 SHELL = @SHELL@
 
 CURPATH = $(shell pwd)
-TOPPATH = $(shell cd $(path_to_top) && pwd)
+TOPPATH = $(shell cd $(top_builddir) && pwd)
 RELPATH = $(shell echo '$(CURPATH)' | sed 's,$(TOPPATH),,;s,^/,,;s,\([a-z0-9]\)$$,\1/,')
 
-PATHSCRIPT = case '@top_srcdir@' in /*) ;; *) echo $(path_to_top)/;; esac
+PATHSCRIPT = case '@top_srcdir@' in /*) ;; *) echo $(top_builddir)/;; esac
 PATHPREFIX = $(shell $(PATHSCRIPT))
 
 top_srcdir = $(PATHPREFIX)@top_srcdir@
 srcdir = $(top_srcdir)/$(RELPATH)
-top_builddir = $(path_to_top)
 prefix = @prefix@
 exec_prefix = @exec_prefix@
 
diff --git a/configure.in b/configure.in
index 6cf279ec..c0931fa7 100644
--- a/configure.in
+++ b/configure.in
@@ -1249,10 +1249,10 @@ srcdir2="$(cd "$srcdir" && pwd)"
 if test "$srcdir2" != "$builddir"; then
 	for i in $(make -C "$srcdir" list | grep Makefile); do
 		$MKINSTALLDIRS "$builddir/$(dirname $i)"
-		grep path_to_top= "$srcdir/$i" > "$builddir/$i"
+		grep top_builddir= "$srcdir/$i" > "$builddir/$i"
 		case "$srcdir" in
 		/*)	echo "include $srcdir/$i" >> "$builddir/$i" ;;
-		*)	echo "include \$(path_to_top)/$srcdir/$i" >> "$builddir/$i" ;;
+		*)	echo "include \$(top_builddir)/$srcdir/$i" >> "$builddir/$i" ;;
 		esac
 		echo "creating $builddir/$i"
 	done
diff --git a/doc/Makefile b/doc/Makefile
index bb259849..fc440d6b 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -1,5 +1,5 @@
-path_to_top=..
-include $(path_to_top)/Makefile.config
+top_builddir=..
+include $(top_builddir)/Makefile.config
 
 SUBDIRS = man
 
diff --git a/doc/man/Makefile b/doc/man/Makefile
index 33372353..d7cb602f 100644
--- a/doc/man/Makefile
+++ b/doc/man/Makefile
@@ -1,5 +1,5 @@
-path_to_top=../..
-include $(path_to_top)/Makefile.config
+top_builddir=../..
+include $(top_builddir)/Makefile.config
 
 SUBDIRS = man1 man5
 
diff --git a/doc/man/man1/Makefile b/doc/man/man1/Makefile
index ea1e9332..5d57aaa2 100644
--- a/doc/man/man1/Makefile
+++ b/doc/man/man1/Makefile
@@ -1,5 +1,5 @@
-path_to_top=../../..
-include $(path_to_top)/Makefile.config
+top_builddir=../../..
+include $(top_builddir)/Makefile.config
 
 elinks.1: $(srcdir)/elinks.1.in $(top_srcdir)/configure.in
 	cd $(top_srcdir) && \
diff --git a/doc/man/man5/Makefile b/doc/man/man5/Makefile
index 33124497..b659a393 100644
--- a/doc/man/man5/Makefile
+++ b/doc/man/man5/Makefile
@@ -1,5 +1,5 @@
-path_to_top=../../..
-include $(path_to_top)/Makefile.config
+top_builddir=../../..
+include $(top_builddir)/Makefile.config
 
 MAN5 = $(srcdir)/elinks.conf.5 $(srcdir)/elinkskeys.5
 
diff --git a/po/Makefile b/po/Makefile
index 45fa754a..da3079aa 100644
--- a/po/Makefile
+++ b/po/Makefile
@@ -1,5 +1,5 @@
-path_to_top=..
-include $(path_to_top)/Makefile.config
+top_builddir=..
+include $(top_builddir)/Makefile.config
 
 # Where to install the catalog files.
 localedir = $(datadir)/locale
diff --git a/src/Makefile b/src/Makefile
index 252f5e86..622421f5 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,5 +1,5 @@
-path_to_top=..
-include $(path_to_top)/Makefile.config
+top_builddir=..
+include $(top_builddir)/Makefile.config
 
 SUBDIRS-$(CONFIG_BOOKMARKS)	+= bookmarks
 SUBDIRS-$(CONFIG_COOKIES)	+= cookies
diff --git a/src/bfu/Makefile b/src/bfu/Makefile
index 9ff3868f..4aae4a8a 100644
--- a/src/bfu/Makefile
+++ b/src/bfu/Makefile
@@ -1,5 +1,5 @@
-path_to_top=../..
-include $(path_to_top)/Makefile.config
+top_builddir=../..
+include $(top_builddir)/Makefile.config
 
 OBJS-$(CONFIG_LEDS) += leds.o
 
diff --git a/src/bookmarks/Makefile b/src/bookmarks/Makefile
index cdbae63c..02a0f379 100644
--- a/src/bookmarks/Makefile
+++ b/src/bookmarks/Makefile
@@ -1,5 +1,5 @@
-path_to_top=../..
-include $(path_to_top)/Makefile.config
+top_builddir=../..
+include $(top_builddir)/Makefile.config
 
 SUBDIRS = backend
 OBJS	= bookmarks.o dialogs.o
diff --git a/src/bookmarks/backend/Makefile b/src/bookmarks/backend/Makefile
index f02d9131..889413dd 100644
--- a/src/bookmarks/backend/Makefile
+++ b/src/bookmarks/backend/Makefile
@@ -1,5 +1,5 @@
-path_to_top=../../..
-include $(path_to_top)/Makefile.config
+top_builddir=../../..
+include $(top_builddir)/Makefile.config
 
 OBJS-$(CONFIG_XBEL_BOOKMARKS) += xbel.o
 OBJS = common.o default.o
diff --git a/src/cache/Makefile b/src/cache/Makefile
index c90b4f83..bd813e19 100644
--- a/src/cache/Makefile
+++ b/src/cache/Makefile
@@ -1,5 +1,5 @@
-path_to_top=../..
-include $(path_to_top)/Makefile.config
+top_builddir=../..
+include $(top_builddir)/Makefile.config
 
 OBJS = cache.o dialogs.o
 
diff --git a/src/config/Makefile b/src/config/Makefile
index 41768647..2f86c3cc 100644
--- a/src/config/Makefile
+++ b/src/config/Makefile
@@ -1,5 +1,5 @@
-path_to_top=../..
-include $(path_to_top)/Makefile.config
+top_builddir=../..
+include $(top_builddir)/Makefile.config
 
 OBJS = cmdline.o conf.o dialogs.o home.o kbdbind.o options.o opttypes.o timer.o urlhist.o
 
diff --git a/src/cookies/Makefile b/src/cookies/Makefile
index 437b3afa..a8bb75a4 100644
--- a/src/cookies/Makefile
+++ b/src/cookies/Makefile
@@ -1,5 +1,5 @@
-path_to_top=../..
-include $(path_to_top)/Makefile.config
+top_builddir=../..
+include $(top_builddir)/Makefile.config
 
 OBJS = cookies.o dialogs.o parser.o
 
diff --git a/src/dialogs/Makefile b/src/dialogs/Makefile
index 2b9c3224..d82b7467 100644
--- a/src/dialogs/Makefile
+++ b/src/dialogs/Makefile
@@ -1,5 +1,5 @@
-path_to_top=../..
-include $(path_to_top)/Makefile.config
+top_builddir=../..
+include $(top_builddir)/Makefile.config
 
 OBJS-$(CONFIG_EXMODE) += exmode.o
 
diff --git a/src/document/Makefile b/src/document/Makefile
index a23396da..5a316631 100644
--- a/src/document/Makefile
+++ b/src/document/Makefile
@@ -1,5 +1,5 @@
-path_to_top=../..
-include $(path_to_top)/Makefile.config
+top_builddir=../..
+include $(top_builddir)/Makefile.config
 
 SUBDIRS-$(CONFIG_CSS)	+= css
 SUBDIRS-$(CONFIG_DOM)	+= dom sgml
diff --git a/src/document/css/Makefile b/src/document/css/Makefile
index cbfeb97a..f1446a8c 100644
--- a/src/document/css/Makefile
+++ b/src/document/css/Makefile
@@ -1,5 +1,5 @@
-path_to_top=../../..
-include $(path_to_top)/Makefile.config
+top_builddir=../../..
+include $(top_builddir)/Makefile.config
 
 OBJS = apply.o css.o parser.o property.o scanner.o stylesheet.o value.o
 
diff --git a/src/document/dom/Makefile b/src/document/dom/Makefile
index 4eaed567..2b5ccff8 100644
--- a/src/document/dom/Makefile
+++ b/src/document/dom/Makefile
@@ -1,5 +1,5 @@
-path_to_top=../../..
-include $(path_to_top)/Makefile.config
+top_builddir=../../..
+include $(top_builddir)/Makefile.config
 
 OBJS = navigator.o node.o renderer.o
 
diff --git a/src/document/html/Makefile b/src/document/html/Makefile
index a647a73b..5f7510b0 100644
--- a/src/document/html/Makefile
+++ b/src/document/html/Makefile
@@ -1,5 +1,5 @@
-path_to_top=../../..
-include $(path_to_top)/Makefile.config
+top_builddir=../../..
+include $(top_builddir)/Makefile.config
 
 SUBDIRS = parser
 OBJS	= frames.o parser.o renderer.o tables.o
diff --git a/src/document/html/parser/Makefile b/src/document/html/parser/Makefile
index 350f204e..c72b05a8 100644
--- a/src/document/html/parser/Makefile
+++ b/src/document/html/parser/Makefile
@@ -1,5 +1,5 @@
-path_to_top=../../../..
-include $(path_to_top)/Makefile.config
+top_builddir=../../../..
+include $(top_builddir)/Makefile.config
 
 OBJS = forms.o general.o link.o parse.o stack.o table.o
 
diff --git a/src/document/plain/Makefile b/src/document/plain/Makefile
index 296e4f77..21f56d72 100644
--- a/src/document/plain/Makefile
+++ b/src/document/plain/Makefile
@@ -1,5 +1,5 @@
-path_to_top=../../..
-include $(path_to_top)/Makefile.config
+top_builddir=../../..
+include $(top_builddir)/Makefile.config
 
 OBJS = renderer.o
 
diff --git a/src/document/sgml/Makefile b/src/document/sgml/Makefile
index 1049949d..c2b71541 100644
--- a/src/document/sgml/Makefile
+++ b/src/document/sgml/Makefile
@@ -1,5 +1,5 @@
-path_to_top=../../..
-include $(path_to_top)/Makefile.config
+top_builddir=../../..
+include $(top_builddir)/Makefile.config
 
 SUBDIRS = html
 OBJS	= sgml.o parser.o scanner.o
diff --git a/src/document/sgml/html/Makefile b/src/document/sgml/html/Makefile
index 7f01ced0..dfae8cf1 100644
--- a/src/document/sgml/html/Makefile
+++ b/src/document/sgml/html/Makefile
@@ -1,5 +1,5 @@
-path_to_top=../../../..
-include $(path_to_top)/Makefile.config
+top_builddir=../../../..
+include $(top_builddir)/Makefile.config
 
 OBJS = html.o
 
diff --git a/src/ecmascript/Makefile b/src/ecmascript/Makefile
index 3035cba7..441d0073 100644
--- a/src/ecmascript/Makefile
+++ b/src/ecmascript/Makefile
@@ -1,5 +1,5 @@
-path_to_top=../..
-include $(path_to_top)/Makefile.config
+top_builddir=../..
+include $(top_builddir)/Makefile.config
 INCLUDES += $(SPIDERMONKEY_CFLAGS)
 
 SUBDIRS = spidermonkey
diff --git a/src/ecmascript/spidermonkey/Makefile b/src/ecmascript/spidermonkey/Makefile
index 2419a25b..f1c0fef3 100644
--- a/src/ecmascript/spidermonkey/Makefile
+++ b/src/ecmascript/spidermonkey/Makefile
@@ -1,5 +1,5 @@
-path_to_top=../../..
-include $(path_to_top)/Makefile.config
+top_builddir=../../..
+include $(top_builddir)/Makefile.config
 INCLUDES += $(SPIDERMONKEY_CFLAGS)
 
 OBJS = document.o form.o location.o navigator.o unibar.o window.o
diff --git a/src/encoding/Makefile b/src/encoding/Makefile
index 98183481..7f75f4bd 100644
--- a/src/encoding/Makefile
+++ b/src/encoding/Makefile
@@ -1,5 +1,5 @@
-path_to_top=../..
-include $(path_to_top)/Makefile.config
+top_builddir=../..
+include $(top_builddir)/Makefile.config
 
 OBJS-$(CONFIG_BZIP2)	+= bzip2.o
 OBJS-$(CONFIG_GZIP)	+= gzip.o
diff --git a/src/formhist/Makefile b/src/formhist/Makefile
index da826f56..9aa02119 100644
--- a/src/formhist/Makefile
+++ b/src/formhist/Makefile
@@ -1,5 +1,5 @@
-path_to_top=../..
-include $(path_to_top)/Makefile.config
+top_builddir=../..
+include $(top_builddir)/Makefile.config
 
 OBJS = formhist.o dialogs.o
 
diff --git a/src/globhist/Makefile b/src/globhist/Makefile
index deec86e2..bb733d2b 100644
--- a/src/globhist/Makefile
+++ b/src/globhist/Makefile
@@ -1,5 +1,5 @@
-path_to_top=../..
-include $(path_to_top)/Makefile.config
+top_builddir=../..
+include $(top_builddir)/Makefile.config
 
 OBJS = globhist.o dialogs.o
 
diff --git a/src/intl/Makefile b/src/intl/Makefile
index 6f739a01..596c61d7 100644
--- a/src/intl/Makefile
+++ b/src/intl/Makefile
@@ -1,5 +1,5 @@
-path_to_top=../..
-include $(path_to_top)/Makefile.config
+top_builddir=../..
+include $(top_builddir)/Makefile.config
 
 SUBDIRS-$(CONFIG_NLS) += gettext
 
diff --git a/src/intl/gettext/Makefile b/src/intl/gettext/Makefile
index 1bd98cfb..91702596 100644
--- a/src/intl/gettext/Makefile
+++ b/src/intl/gettext/Makefile
@@ -1,5 +1,5 @@
-path_to_top=../../..
-include $(path_to_top)/Makefile.config
+top_builddir=../../..
+include $(top_builddir)/Makefile.config
 
 localedir = $(datadir)/locale
 builddir = $(top_builddir)/src/intl/gettext
diff --git a/src/main/Makefile b/src/main/Makefile
index 4eef90ee..c5d19a34 100644
--- a/src/main/Makefile
+++ b/src/main/Makefile
@@ -1,5 +1,5 @@
-path_to_top=../..
-include $(path_to_top)/Makefile.config
+top_builddir=../..
+include $(top_builddir)/Makefile.config
 
 OBJS-$(CONFIG_INTERLINK) += interlink.o
 
diff --git a/src/mime/Makefile b/src/mime/Makefile
index 578d1ec4..5757c3b3 100644
--- a/src/mime/Makefile
+++ b/src/mime/Makefile
@@ -1,5 +1,5 @@
-path_to_top=../..
-include $(path_to_top)/Makefile.config
+top_builddir=../..
+include $(top_builddir)/Makefile.config
 
 SUBDIRS = backend
 OBJS	= dialogs.o mime.o
diff --git a/src/mime/backend/Makefile b/src/mime/backend/Makefile
index 9a2c0087..b1e61a0c 100644
--- a/src/mime/backend/Makefile
+++ b/src/mime/backend/Makefile
@@ -1,5 +1,5 @@
-path_to_top=../../..
-include $(path_to_top)/Makefile.config
+top_builddir=../../..
+include $(top_builddir)/Makefile.config
 
 OBJS-$(CONFIG_MAILCAP)		+= mailcap.o
 OBJS-$(CONFIG_MIMETYPES)	+= mimetypes.o
diff --git a/src/network/Makefile b/src/network/Makefile
index 64f884c8..7da2b6df 100644
--- a/src/network/Makefile
+++ b/src/network/Makefile
@@ -1,5 +1,5 @@
-path_to_top=../..
-include $(path_to_top)/Makefile.config
+top_builddir=../..
+include $(top_builddir)/Makefile.config
 
 SUBDIRS-$(CONFIG_SSL) += ssl
 
diff --git a/src/network/ssl/Makefile b/src/network/ssl/Makefile
index c5e615e6..26f02c22 100644
--- a/src/network/ssl/Makefile
+++ b/src/network/ssl/Makefile
@@ -1,5 +1,5 @@
-path_to_top=../../..
-include $(path_to_top)/Makefile.config
+top_builddir=../../..
+include $(top_builddir)/Makefile.config
 
 INCLUDES += $(GNUTLS_CFLAGS) $(OPENSSL_CFLAGS)
 
diff --git a/src/osdep/Makefile b/src/osdep/Makefile
index 6e4e2218..5ac1390b 100644
--- a/src/osdep/Makefile
+++ b/src/osdep/Makefile
@@ -1,5 +1,5 @@
-path_to_top=../..
-include $(path_to_top)/Makefile.config
+top_builddir=../..
+include $(top_builddir)/Makefile.config
 INCLUDES += $(X_CFLAGS)
 
 SUBDIRS-$(CONFIG_BEOS)		+= beos
diff --git a/src/osdep/beos/Makefile b/src/osdep/beos/Makefile
index a5317949..6f5e9c46 100644
--- a/src/osdep/beos/Makefile
+++ b/src/osdep/beos/Makefile
@@ -1,5 +1,5 @@
-path_to_top=../../..
-include $(path_to_top)/Makefile.config
+top_builddir=../../..
+include $(top_builddir)/Makefile.config
 
 OBJS = beos.o overrides.o
 
diff --git a/src/osdep/os2/Makefile b/src/osdep/os2/Makefile
index b9891042..d8c216d2 100644
--- a/src/osdep/os2/Makefile
+++ b/src/osdep/os2/Makefile
@@ -1,5 +1,5 @@
-path_to_top=../../..
-include $(path_to_top)/Makefile.config
+top_builddir=../../..
+include $(top_builddir)/Makefile.config
 
 OBJS = os2.o
 
diff --git a/src/osdep/riscos/Makefile b/src/osdep/riscos/Makefile
index e4dc7f6d..39bce2dc 100644
--- a/src/osdep/riscos/Makefile
+++ b/src/osdep/riscos/Makefile
@@ -1,5 +1,5 @@
-path_to_top=../../..
-include $(path_to_top)/Makefile.config
+top_builddir=../../..
+include $(top_builddir)/Makefile.config
 
 OBJS = riscos.o
 
diff --git a/src/osdep/unix/Makefile b/src/osdep/unix/Makefile
index 3b0074cc..53d025c6 100644
--- a/src/osdep/unix/Makefile
+++ b/src/osdep/unix/Makefile
@@ -1,5 +1,5 @@
-path_to_top=../../..
-include $(path_to_top)/Makefile.config
+top_builddir=../../..
+include $(top_builddir)/Makefile.config
 
 OBJS = unix.o bsd.o
 
diff --git a/src/osdep/win32/Makefile b/src/osdep/win32/Makefile
index f4a7075f..b8ca9775 100644
--- a/src/osdep/win32/Makefile
+++ b/src/osdep/win32/Makefile
@@ -1,5 +1,5 @@
-path_to_top=../../..
-include $(path_to_top)/Makefile.config
+top_builddir=../../..
+include $(top_builddir)/Makefile.config
 
 OBJS = win32.o overrides.o
 
diff --git a/src/protocol/Makefile b/src/protocol/Makefile
index 4f74d285..9c49a21c 100644
--- a/src/protocol/Makefile
+++ b/src/protocol/Makefile
@@ -1,5 +1,5 @@
-path_to_top=../..
-include $(path_to_top)/Makefile.config
+top_builddir=../..
+include $(top_builddir)/Makefile.config
 
 SUBDIRS-$(CONFIG_BITTORRENT)	+= bittorrent
 SUBDIRS-$(CONFIG_FINGER)	+= finger
diff --git a/src/protocol/auth/Makefile b/src/protocol/auth/Makefile
index 379558a7..fb58378c 100644
--- a/src/protocol/auth/Makefile
+++ b/src/protocol/auth/Makefile
@@ -1,5 +1,5 @@
-path_to_top=../../..
-include $(path_to_top)/Makefile.config
+top_builddir=../../..
+include $(top_builddir)/Makefile.config
 
 # Needed for the digest MD5 sum calculation.
 INCLUDES += $(GNUTLS_CFLAGS) $(OPENSSL_CFLAGS)
diff --git a/src/protocol/bittorrent/Makefile b/src/protocol/bittorrent/Makefile
index 6404059b..9b49c365 100644
--- a/src/protocol/bittorrent/Makefile
+++ b/src/protocol/bittorrent/Makefile
@@ -1,5 +1,5 @@
-path_to_top=../../..
-include $(path_to_top)/Makefile.config
+top_builddir=../../..
+include $(top_builddir)/Makefile.config
 
 INCLUDES += $(GNUTLS_CFLAGS) $(OPENSSL_CFLAGS)
 
diff --git a/src/protocol/file/Makefile b/src/protocol/file/Makefile
index dfbfd137..3d27a63b 100644
--- a/src/protocol/file/Makefile
+++ b/src/protocol/file/Makefile
@@ -1,5 +1,5 @@
-path_to_top=../../..
-include $(path_to_top)/Makefile.config
+top_builddir=../../..
+include $(top_builddir)/Makefile.config
 
 OBJS-$(CONFIG_CGI) += cgi.o
 
diff --git a/src/protocol/finger/Makefile b/src/protocol/finger/Makefile
index fbbfa181..9b374fcf 100644
--- a/src/protocol/finger/Makefile
+++ b/src/protocol/finger/Makefile
@@ -1,5 +1,5 @@
-path_to_top=../../..
-include $(path_to_top)/Makefile.config
+top_builddir=../../..
+include $(top_builddir)/Makefile.config
 
 OBJS = finger.o
 
diff --git a/src/protocol/ftp/Makefile b/src/protocol/ftp/Makefile
index 6d297094..bbdcedb1 100644
--- a/src/protocol/ftp/Makefile
+++ b/src/protocol/ftp/Makefile
@@ -1,5 +1,5 @@
-path_to_top=../../..
-include $(path_to_top)/Makefile.config
+top_builddir=../../..
+include $(top_builddir)/Makefile.config
 
 OBJS = ftp.o parse.o
 
diff --git a/src/protocol/gopher/Makefile b/src/protocol/gopher/Makefile
index b332f2d1..94fa3318 100644
--- a/src/protocol/gopher/Makefile
+++ b/src/protocol/gopher/Makefile
@@ -1,5 +1,5 @@
-path_to_top=../../..
-include $(path_to_top)/Makefile.config
+top_builddir=../../..
+include $(top_builddir)/Makefile.config
 
 OBJS = gopher.o
 
diff --git a/src/protocol/http/Makefile b/src/protocol/http/Makefile
index 8033a91a..10ffb867 100644
--- a/src/protocol/http/Makefile
+++ b/src/protocol/http/Makefile
@@ -1,5 +1,5 @@
-path_to_top=../../..
-include $(path_to_top)/Makefile.config
+top_builddir=../../..
+include $(top_builddir)/Makefile.config
 
 OBJS = blacklist.o codes.o http.o
 
diff --git a/src/protocol/nntp/Makefile b/src/protocol/nntp/Makefile
index 3078851e..e53273c4 100644
--- a/src/protocol/nntp/Makefile
+++ b/src/protocol/nntp/Makefile
@@ -1,5 +1,5 @@
-path_to_top=../../..
-include $(path_to_top)/Makefile.config
+top_builddir=../../..
+include $(top_builddir)/Makefile.config
 
 OBJS = nntp.o connection.o response.o
 
diff --git a/src/protocol/rewrite/Makefile b/src/protocol/rewrite/Makefile
index f063cce6..a9f9066d 100644
--- a/src/protocol/rewrite/Makefile
+++ b/src/protocol/rewrite/Makefile
@@ -1,5 +1,5 @@
-path_to_top=../../..
-include $(path_to_top)/Makefile.config
+top_builddir=../../..
+include $(top_builddir)/Makefile.config
 
 OBJS = rewrite.o
 
diff --git a/src/protocol/smb/Makefile b/src/protocol/smb/Makefile
index 1d430bf9..ef1f8b6f 100644
--- a/src/protocol/smb/Makefile
+++ b/src/protocol/smb/Makefile
@@ -1,5 +1,5 @@
-path_to_top=../../..
-include $(path_to_top)/Makefile.config
+top_builddir=../../..
+include $(top_builddir)/Makefile.config
 
 OBJS = smb.o
 
diff --git a/src/scripting/Makefile b/src/scripting/Makefile
index 863a26b0..2e3d791c 100644
--- a/src/scripting/Makefile
+++ b/src/scripting/Makefile
@@ -1,5 +1,5 @@
-path_to_top=../..
-include $(path_to_top)/Makefile.config
+top_builddir=../..
+include $(top_builddir)/Makefile.config
 
 SUBDIRS-$(CONFIG_GUILE)		+= guile
 SUBDIRS-$(CONFIG_LUA)		+= lua
diff --git a/src/scripting/guile/Makefile b/src/scripting/guile/Makefile
index 244b12eb..3f903721 100644
--- a/src/scripting/guile/Makefile
+++ b/src/scripting/guile/Makefile
@@ -1,5 +1,5 @@
-path_to_top=../../..
-include $(path_to_top)/Makefile.config
+top_builddir=../../..
+include $(top_builddir)/Makefile.config
 
 INCLUDES += $(GUILE_CFLAGS)
 
diff --git a/src/scripting/lua/Makefile b/src/scripting/lua/Makefile
index e35dd58c..61d5df5b 100644
--- a/src/scripting/lua/Makefile
+++ b/src/scripting/lua/Makefile
@@ -1,5 +1,5 @@
-path_to_top=../../..
-include $(path_to_top)/Makefile.config
+top_builddir=../../..
+include $(top_builddir)/Makefile.config
 
 INCLUDES += $(LUA_CFLAGS)
 
diff --git a/src/scripting/perl/Makefile b/src/scripting/perl/Makefile
index bc1a94b5..0a753aaf 100644
--- a/src/scripting/perl/Makefile
+++ b/src/scripting/perl/Makefile
@@ -1,5 +1,5 @@
-path_to_top=../../..
-include $(path_to_top)/Makefile.config
+top_builddir=../../..
+include $(top_builddir)/Makefile.config
 
 INCLUDES += $(PERL_CFLAGS)
 
diff --git a/src/scripting/python/Makefile b/src/scripting/python/Makefile
index f4203a16..486eddd4 100644
--- a/src/scripting/python/Makefile
+++ b/src/scripting/python/Makefile
@@ -1,5 +1,5 @@
-path_to_top=../../..
-include $(path_to_top)/Makefile.config
+top_builddir=../../..
+include $(top_builddir)/Makefile.config
 
 INCLUDES += $(PYTHON_CFLAGS)
 
diff --git a/src/scripting/ruby/Makefile b/src/scripting/ruby/Makefile
index 494513cc..88943686 100644
--- a/src/scripting/ruby/Makefile
+++ b/src/scripting/ruby/Makefile
@@ -1,5 +1,5 @@
-path_to_top=../../..
-include $(path_to_top)/Makefile.config
+top_builddir=../../..
+include $(top_builddir)/Makefile.config
 
 INCLUDES += $(RUBY_CFLAGS)
 
diff --git a/src/session/Makefile b/src/session/Makefile
index 89a9e6d7..e57a987a 100644
--- a/src/session/Makefile
+++ b/src/session/Makefile
@@ -1,5 +1,5 @@
-path_to_top=../..
-include $(path_to_top)/Makefile.config
+top_builddir=../..
+include $(top_builddir)/Makefile.config
 
 OBJS = download.o history.o location.o session.o task.o
 
diff --git a/src/terminal/Makefile b/src/terminal/Makefile
index 7383c11e..4d7bb458 100644
--- a/src/terminal/Makefile
+++ b/src/terminal/Makefile
@@ -1,5 +1,5 @@
-path_to_top=../..
-include $(path_to_top)/Makefile.config
+top_builddir=../..
+include $(top_builddir)/Makefile.config
 
 OBJS-$(CONFIG_MOUSE) += mouse.o
 
diff --git a/src/util/Makefile b/src/util/Makefile
index 755d8560..e0ea7cf8 100644
--- a/src/util/Makefile
+++ b/src/util/Makefile
@@ -1,5 +1,5 @@
-path_to_top=../..
-include $(path_to_top)/Makefile.config
+top_builddir=../..
+include $(top_builddir)/Makefile.config
 
 # Reverse a CONFIG_* string
 # Usage $(call not,$(CONFIG_FOO))
diff --git a/src/viewer/Makefile b/src/viewer/Makefile
index 6aa70d47..cc6e1ef3 100644
--- a/src/viewer/Makefile
+++ b/src/viewer/Makefile
@@ -1,5 +1,5 @@
-path_to_top=../..
-include $(path_to_top)/Makefile.config
+top_builddir=../..
+include $(top_builddir)/Makefile.config
 
 SUBDIRS = dump text
 OBJS	= action.o timer.o
diff --git a/src/viewer/dump/Makefile b/src/viewer/dump/Makefile
index 6f068ae8..d0d2154a 100644
--- a/src/viewer/dump/Makefile
+++ b/src/viewer/dump/Makefile
@@ -1,5 +1,5 @@
-path_to_top=../../..
-include $(path_to_top)/Makefile.config
+top_builddir=../../..
+include $(top_builddir)/Makefile.config
 
 OBJS = dump.o
 
diff --git a/src/viewer/text/Makefile b/src/viewer/text/Makefile
index 5b0ed6f7..06190f1e 100644
--- a/src/viewer/text/Makefile
+++ b/src/viewer/text/Makefile
@@ -1,5 +1,5 @@
-path_to_top=../../..
-include $(path_to_top)/Makefile.config
+top_builddir=../../..
+include $(top_builddir)/Makefile.config
 
 OBJS-$(CONFIG_MARKS) += marks.o