diff --git a/Makefile b/Makefile
index d6cd0db6d7..5036d7d6c6 100644
--- a/Makefile
+++ b/Makefile
@@ -1,17 +1,19 @@
+WAF=python tools/waf-light --jobs=1
+
 all:
-	@tools/waf-light build
+	@$(WAF) build
 
 all-debug:
-	@tools/waf-light -v build
+	@$(WAF) -v build
 
 all-progress:
-	@tools/waf-light -p build
+	@$(WAF) -p build
 
 install:
-	@tools/waf-light install
+	@$(WAF) install
 
 uninstall:
-	@tools/waf-light uninstall
+	@$(WAF) uninstall
 
 test: all
 	python tools/test.py --mode=release
@@ -45,7 +47,7 @@ website-upload: doc
 
 clean:
 	@-rm -f doc/node.1 doc/api.xml doc/api.html
-	@tools/waf-light clean
+	@$(WAF) clean
 
 distclean: clean
 	@-rm -rf build/
diff --git a/configure b/configure
index bb1e754ce5..7267f64eb0 100755
--- a/configure
+++ b/configure
@@ -16,8 +16,6 @@ cd $WORKINGDIR
 WORKINGDIR=`pwd`
 cd $CUR_DIR
 
-WAF="${WORKINGDIR}/tools/waf-light"
-
-"${WAF}" configure $*
+"${WORKINGDIR}/tools/waf-light" --jobs=1 configure $*
 
 exit $?