:: commit aa37f16bc8ba775aaed99c6b366e6c689f7cab25

diff --git a/GNUmakefile.in b/GNUmakefile.in
index 8ed79a29..0a76d5a8 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -13,7 +13,7 @@ MKESCAPE = $(subst $(SPACE),\ ,$(1))
 SHESCAPE = $(subst ','\'',$(1))
 NASMESCAPE = $(subst ','"'$(COMMA) \"'\"$(COMMA) '"',$(1))
 
-override PATH := $(BUILDDIR)/toolchain/bin:/usr/local/bin:$(PATH)
+override PATH := $(SRCDIR)/toolchain/bin:$(BUILDDIR)/toolchain/bin:/usr/local/bin:$(PATH)
 export PATH
 
 override BUILD_ELTORITO_EFI := @build_eltorito_efi@
diff --git a/configure.ac b/configure.ac
index 522db57f..3b447876 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,8 +4,9 @@ AC_PREREQ(2.69)
 
 AC_CONFIG_AUX_DIR([build-aux])
 
-TOOLCHAIN_DIR="$(pwd -P)/toolchain/bin"
-PATH="$TOOLCHAIN_DIR$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR$PATH"
+SOURCE_DIR="$(cd "$srcdir" && pwd -P)"
+BUILD_DIR="$(pwd -P)"
+PATH="$BUILD_DIR/toolchain/bin$PATH_SEPARATOR$SOURCE_DIR/toolchain/bin$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR$PATH"
 export PATH
 
 test "x$CFLAGS" = "x" && CFLAGS='-g -O2 -pipe -Wall -Wextra'