diff --git a/CHANGES b/CHANGES
index 5c36bf33e..b3c15ca45 100644
--- a/CHANGES
+++ b/CHANGES
@@ -900,4 +900,5 @@
 [1.2.1]
 * Set max ttl of unbound to 5 minutes
 * Fix issue where mail container does not cleanup LDAP connections properly
+* Update node to 6.11.1
 
diff --git a/baseimage/initializeBaseUbuntuImage.sh b/baseimage/initializeBaseUbuntuImage.sh
index f13910fc2..c953027ef 100644
--- a/baseimage/initializeBaseUbuntuImage.sh
+++ b/baseimage/initializeBaseUbuntuImage.sh
@@ -42,10 +42,10 @@ apt-get -y install \
     unbound
 
 echo "==> Installing node.js"
-mkdir -p /usr/local/node-6.9.2
-curl -sL https://nodejs.org/dist/v6.9.2/node-v6.9.2-linux-x64.tar.gz | tar zxvf - --strip-components=1 -C /usr/local/node-6.9.2
-ln -sf /usr/local/node-6.9.2/bin/node /usr/bin/node
-ln -sf /usr/local/node-6.9.2/bin/npm /usr/bin/npm
+mkdir -p /usr/local/node-6.11.1
+curl -sL https://nodejs.org/dist/v6.11.1/node-v6.11.1-linux-x64.tar.gz | tar zxvf - --strip-components=1 -C /usr/local/node-6.11.1
+ln -sf /usr/local/node-6.11.1/bin/node /usr/bin/node
+ln -sf /usr/local/node-6.11.1/bin/npm /usr/bin/npm
 apt-get install -y python   # Install python which is required for npm rebuild
 [[ "$(python --version 2>&1)" == "Python 2.7."* ]] || die "Expecting python version to be 2.7.x"
 
diff --git a/scripts/createReleaseTarball b/scripts/createReleaseTarball
index d3c74b673..8cdc01e27 100755
--- a/scripts/createReleaseTarball
+++ b/scripts/createReleaseTarball
@@ -31,8 +31,8 @@ if ! $(cd "${SOURCE_DIR}" && git diff --exit-code >/dev/null); then
     exit 1
 fi
 
-if [[ "$(node --version)" != "v6.9.2" ]]; then
-    echo "This script requires node 6.9.2"
+if [[ "$(node --version)" != "v6.11.1" ]]; then
+    echo "This script requires node 6.11.1"
     exit 1
 fi
 
diff --git a/scripts/installer.sh b/scripts/installer.sh
index ccbccdab8..9c15f912b 100755
--- a/scripts/installer.sh
+++ b/scripts/installer.sh
@@ -34,6 +34,15 @@ while true; do
     esac
 done
 
+echo "==> installer: updating node"
+if [[ "$(node --version)" != "v6.11.1" ]]; then
+    mkdir -p /usr/local/node-6.11.1
+    $curl -sL https://nodejs.org/dist/v6.11.1/node-v6.11.1-linux-x64.tar.gz | tar zxvf - --strip-components=1 -C /usr/local/node-6.11.1
+    ln -sf /usr/local/node-6.11.1/bin/node /usr/bin/node
+    ln -sf /usr/local/node-6.11.1/bin/npm /usr/bin/npm
+    rm -rf /usr/local/node-6.9.2
+fi
+
 for try in `seq 1 10`; do
     # for reasons unknown, the dtrace package will fail. but rebuilding second time will work