diff --git a/Makefile b/Makefile
index f8dbeaffd4..2511dce1c0 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,6 @@
 BUILDTYPE ?= Release
 
 all: out/Makefile
-	tools/gyp_node -f make
 	$(MAKE) -C out BUILDTYPE=$(BUILDTYPE)
 	-ln -fs out/Release/node node
 	-ln -fs out/Debug/node node_g
@@ -14,7 +13,8 @@ clean:
 	rm -rf out
 
 distclean:
-	rm -rf out
+	-rm -rf out
+	-options.gypi
 
 test: all
 	python tools/test.py --mode=release simple message
diff --git a/configure b/configure
index 36ffb6bcf7..53b63b186c 100755
--- a/configure
+++ b/configure
@@ -246,4 +246,4 @@ json.dump(output, f, indent=2, skipkeys=True)
 f.write("\n")
 f.close()
 
-subprocess.call('tools/gyp_node')
+subprocess.call(['tools/gyp_node','-f', 'make'])