diff --git a/trunk/PKGBUILD b/trunk/PKGBUILD
index 8629131..94d47b3 100644
--- a/trunk/PKGBUILD
+++ b/trunk/PKGBUILD
@@ -13,8 +13,10 @@ provides=('nodejs-node-gyp')
 makedepends=('procps-ng' 'marked-man')
 optdepends=('python2: for node-gyp')
 options=('!emptydirs')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/npm/npm/archive/v$pkgver.tar.gz")
-sha512sums=('e100e0819bae1e5d9b4766319a8280801160dca75244a50a99a2f2b9ca36da2dba432e9ee615735e21030684982f811bf7b90349e073e8c6e740f5eb8a446298')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/npm/npm/archive/v$pkgver.tar.gz"
+        'node-gyp')
+sha512sums=('e100e0819bae1e5d9b4766319a8280801160dca75244a50a99a2f2b9ca36da2dba432e9ee615735e21030684982f811bf7b90349e073e8c6e740f5eb8a446298'
+            'fbb8dd6cb31e55b7b038c8eecd7cbcde351200331799cfa5cca0b98f73591b765d9218afaf23cfcd44bcb5b0d469c21567e0e443065e2339fcb90e96dd5b70f5')
 
 prepare() {
   cd npm-$pkgver
@@ -28,11 +30,11 @@ build() {
 
 package() {
   cd npm-$pkgver
+  ./configure --nodedir=/usr
   make NPMOPTS="--prefix=\"$pkgdir/usr\"" install
 
   # Provide node-gyp executable
-  cp "$pkgdir"/usr/lib/node_modules/npm/bin/node-gyp-bin/node-gyp "$pkgdir"/usr/bin/node-gyp
-  sed -i 's|"`dirname "$0"`/../../|"`dirname "$0"`/../lib/node_modules/npm/|' "$pkgdir"/usr/bin/node-gyp
+  install -m755 "$srcdir"/node-gyp "$pkgdir"/usr/bin/node-gyp
 
   # Why 777? :/
   chmod -R u=rwX,go=rX "$pkgdir"
diff --git a/trunk/node-gyp b/trunk/node-gyp
new file mode 100755
index 0000000..ecf1252
--- /dev/null
+++ b/trunk/node-gyp
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+nodedir_given=false
+
+for arg in "$@"; do
+  if [ "$arg" = --nodedir -o "$arg" = --nodedir=* ]; then
+    nodedir_given=true
+  fi
+done
+
+if $nodedir_given; then
+  exec /usr/lib/node_modules/npm/bin/node-gyp-bin/node-gyp "$@"
+fi
+
+exec /usr/lib/node_modules/npm/bin/node-gyp-bin/node-gyp --nodedir /usr "$@"