diff --git a/buildtools/scripts/Makefile.waf b/buildtools/scripts/Makefile.waf
index 5fc939c99e0..a15a5f87607 100644
--- a/buildtools/scripts/Makefile.waf
+++ b/buildtools/scripts/Makefile.waf
@@ -1,7 +1,7 @@
 # simple makefile wrapper to run waf
 
-WAF_BINARY=BUILDTOOLS/bin/waf
-WAF=WAF_MAKE=1 $(WAF_BINARY)
+WAF_BINARY=$(PYTHON) BUILDTOOLS/bin/waf
+WAF=PYTHONHASHSEED=1 WAF_MAKE=1 $(WAF_BINARY)
 
 all:
 	$(WAF) build
diff --git a/buildtools/scripts/configure.waf b/buildtools/scripts/configure.waf
index a7d8d1dbd64..ccb62849a54 100755
--- a/buildtools/scripts/configure.waf
+++ b/buildtools/scripts/configure.waf
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-PREVPATH=`dirname $0`
+PREVPATH=$(dirname $0)
 
 WAF=BUILDTOOLS/bin/waf
 
@@ -9,6 +9,13 @@ WAF=BUILDTOOLS/bin/waf
 JOBS=1
 export JOBS
 
+# Make sure we don't have any library preloaded.
+unset LD_PRELOAD
+
+# Make sure we get stable hashes
+PYTHONHASHSEED=1
+export PYTHONHASHSEED
+
 cd BUILDPATH || exit 1
-$WAF configure "$@" || exit 1
+$PYTHON $WAF configure "$@" || exit 1
 cd $PREVPATH
diff --git a/configure b/configure
index 237d2306f79..ef80911d944 100755
--- a/configure
+++ b/configure
@@ -12,6 +12,10 @@ export JOBS
 # Make sure we don't have any library preloaded.
 unset LD_PRELOAD
 
+# Make sure we get stable hashes
+PYTHONHASHSEED=1
+export PYTHONHASHSEED
+
 cd . || exit 1
 $PYTHON $WAF configure "$@" || exit 1
 cd $PREVPATH
diff --git a/ctdb/Makefile b/ctdb/Makefile
index ec362e29408..5dbc7acdc54 100644
--- a/ctdb/Makefile
+++ b/ctdb/Makefile
@@ -1,7 +1,7 @@
 # simple makefile wrapper to run waf
 
 WAF_BINARY=$(PYTHON) ../buildtools/bin/waf
-WAF=WAF_MAKE=1 $(WAF_BINARY)
+WAF=PYTHONHASHSEED=1 WAF_MAKE=1 $(WAF_BINARY)
 
 all:
 	$(WAF) build
diff --git a/ctdb/configure b/ctdb/configure
index dbb0c1446b5..48b786b1612 100755
--- a/ctdb/configure
+++ b/ctdb/configure
@@ -10,6 +10,13 @@ WAF=buildtools/bin/waf
 JOBS=1
 export JOBS
 
+# Make sure we don't have any library preloaded.
+unset LD_PRELOAD
+
+# Make sure we get stable hashes
+PYTHONHASHSEED=1
+export PYTHONHASHSEED
+
 cd . || exit 1
 $PYTHON $WAF configure "$@" || exit 1
 cd $PREVPATH
diff --git a/lib/ldb/configure b/lib/ldb/configure
index 8979f07581b..2ed32403fd7 100755
--- a/lib/ldb/configure
+++ b/lib/ldb/configure
@@ -16,6 +16,13 @@ fi
 JOBS=1
 export JOBS
 
+# Make sure we don't have any library preloaded.
+unset LD_PRELOAD
+
+# Make sure we get stable hashes
+PYTHONHASHSEED=1
+export PYTHONHASHSEED
+
 cd . || exit 1
 $PYTHON $WAF configure "$@" || exit 1
 cd $PREVPATH
diff --git a/lib/replace/configure b/lib/replace/configure
index d0ab6685fbe..af761854ef4 100755
--- a/lib/replace/configure
+++ b/lib/replace/configure
@@ -16,6 +16,13 @@ fi
 JOBS=1
 export JOBS
 
+# Make sure we don't have any library preloaded.
+unset LD_PRELOAD
+
+# Make sure we get stable hashes
+PYTHONHASHSEED=1
+export PYTHONHASHSEED
+
 cd . || exit 1
 $PYTHON $WAF configure "$@" || exit 1
 cd $PREVPATH
diff --git a/lib/talloc/configure b/lib/talloc/configure
index d0ab6685fbe..af761854ef4 100755
--- a/lib/talloc/configure
+++ b/lib/talloc/configure
@@ -16,6 +16,13 @@ fi
 JOBS=1
 export JOBS
 
+# Make sure we don't have any library preloaded.
+unset LD_PRELOAD
+
+# Make sure we get stable hashes
+PYTHONHASHSEED=1
+export PYTHONHASHSEED
+
 cd . || exit 1
 $PYTHON $WAF configure "$@" || exit 1
 cd $PREVPATH
diff --git a/lib/tdb/configure b/lib/tdb/configure
index d0ab6685fbe..af761854ef4 100755
--- a/lib/tdb/configure
+++ b/lib/tdb/configure
@@ -16,6 +16,13 @@ fi
 JOBS=1
 export JOBS
 
+# Make sure we don't have any library preloaded.
+unset LD_PRELOAD
+
+# Make sure we get stable hashes
+PYTHONHASHSEED=1
+export PYTHONHASHSEED
+
 cd . || exit 1
 $PYTHON $WAF configure "$@" || exit 1
 cd $PREVPATH
diff --git a/lib/tevent/configure b/lib/tevent/configure
index 63e4a2a00b5..7b972bd0bc8 100755
--- a/lib/tevent/configure
+++ b/lib/tevent/configure
@@ -16,6 +16,13 @@ fi
 JOBS=1
 export JOBS
 
+# Make sure we don't have any library preloaded.
+unset LD_PRELOAD
+
+# Make sure we get stable hashes
+PYTHONHASHSEED=1
+export PYTHONHASHSEED
+
 cd . || exit 1
 $PYTHON $WAF configure "$@" || exit 1
 cd $PREVPATH