diff --git a/src/freedombone-image-customise b/src/freedombone-image-customise
index eacca2a8..b4ee1684 100755
--- a/src/freedombone-image-customise
+++ b/src/freedombone-image-customise
@@ -572,13 +572,17 @@ install_patchwork() {
         echo $'/usr/bin/node not found'
         exit 7235728
     fi
-    wget https://www.npmjs.com/install.sh -O $rootdir/root/npm_install.sh
-    if [ ! -f $rootdir/root/npm_install.sh ]; then
-        echo $'Unable to download npm installer'
-        exit 8793636
+    if [ -f /usr/share/npm/bin/npm-cli.js ]; then
+        ln -s /usr/share/npm/bin/npm-cli.js /usr/bin/npm
+    else
+        wget https://www.npmjs.com/install.sh -O $rootdir/root/npm_install.sh
+        if [ ! -f $rootdir/root/npm_install.sh ]; then
+            echo $'Unable to download npm installer'
+            exit 8793636
+        fi
     fi
     chroot "$rootdir" chmod +x /root/npm_install.sh
-    chroot "$rootdir" /root/npm_install.sh
+    chroot "$rootdir" /root/npm_install.sh $NPM_VERSION
 
     git clone https://github.com/ssbc/patchwork $rootdir/etc/patchwork
 
diff --git a/src/freedombone-utils-nodejs b/src/freedombone-utils-nodejs
index 8155d8f0..78d9ce4b 100755
--- a/src/freedombone-utils-nodejs
+++ b/src/freedombone-utils-nodejs
@@ -35,7 +35,7 @@ VARIANTS='mesh'
 
 # change these versions at your peril. Things will often crash if you don't
 # have specifically the correct versions
-NODEJS_VERSION='6.10.1'
+NODEJS_VERSION='6.11.3'
 NODEJS_N_VERSION='2.1.7'
 NPM_VERSION='4.0.5'