2 files changed, 3 insertions, 1 deletions

diff --git a/src/dht/Makefile.am b/src/dht/Makefile.am
index b4c03ba60..26beb300b 100644
--- a/src/dht/Makefile.am
+++ b/src/dht/Makefile.am
@@ -254,7 +254,7 @@ check_SCRIPTS = \
   test_dht_tools.py
 endif
 
-do_subst = $(SED) -e 's,[@]PYTHON[@],$(PYTHON),g'
+do_subst = $(SED) -e 's,[@]PYTHON[@],$(PYTHON),g' -e 's,[@]bindir[@],$(bindir),g'
 
 %.py: %.py.in Makefile
         $(do_subst) < $(srcdir)/$< > $@
diff --git a/src/dht/test_dht_tools.py.in b/src/dht/test_dht_tools.py.in
index 9489d12c1..5ceabbfad 100644
--- a/src/dht/test_dht_tools.py.in
+++ b/src/dht/test_dht_tools.py.in
@@ -20,6 +20,8 @@ import subprocess
 import time
 import tempfile
 
+os.environ["PATH"] = "@bindir@" + ":" + os.environ["PATH"];
+
 if os.name == "nt":
   tmp = os.getenv ("TEMP")
 else: