diff --git a/.dntrc b/.dntrc
index 00db35c8..140c82c7 100644
--- a/.dntrc
+++ b/.dntrc
@@ -6,6 +6,6 @@ OUTPUT_PREFIX="sodium-"
 TEST_CMD="\
   cd /dnt/ && \
   npm install && \
-  node_modules/.bin/node-gyp --nodedir /usr/src/node/ rebuild && \
+  node-gyp --nodedir /usr/src/node/ rebuild && \
   make test; \
 "
diff --git a/.gitignore b/.gitignore
index eb7304ac..2dbe8e30 100644
--- a/.gitignore
+++ b/.gitignore
@@ -158,7 +158,6 @@ deps/libsodium/testing
 .libs
 Build
 INSTALL
-Makefile
 Makefile.in
 aclocal.m4
 autom4te.cache
@@ -166,7 +165,6 @@ build
 compile
 confdefs.h
 config.*
-configure
 configure.lineno
 coverage.info
 depcomp
@@ -174,7 +172,7 @@ android-toolchain
 install-sh
 libtool
 libsodium.pc
-libsodium-*
+libsodium-*.pc
 ltmain.sh
 m4/argz.m4
 m4/libtool.m4
diff --git a/Makefile b/Makefile
index 72a0d3d4..5ee0708b 100644
--- a/Makefile
+++ b/Makefile
@@ -59,8 +59,9 @@ ec:
 libsodium:
 ifeq (,$(wildcard ${STATIC_LIB}.*))
 	@echo Static libsodium was not found at ${STATIC_LIB} so compiling libsodium from source.
-	@cd $(LIBSODIUM_DIR)/ && ./configure  \
-		--enable-static --enable-shared --with-pic --prefix="$(INSTALL_DIR)"
+	@cd $(LIBSODIUM_DIR)/ && ./autogen.sh
+	@cd $(LIBSODIUM_DIR)/ && ./configure --enable-static \
+           --enable-shared --with-pic --prefix="$(INSTALL_DIR)"
 	@cd $(LIBSODIUM_DIR)/ && make clean > /dev/null
 	@cd $(LIBSODIUM_DIR)/ && make -j3 check
 	@cd $(LIBSODIUM_DIR)/ && make -j3 install
@@ -71,7 +72,7 @@ else
 endif
 
 sodium: libsodium
-	$(BINDIR)/node-gyp rebuild
+	node-gyp rebuild
 
 test: test-unit