diff --git a/devstack/upgrade/settings b/devstack/upgrade/settings
new file mode 100755
index 000000000..fa9c612c6
--- /dev/null
+++ b/devstack/upgrade/settings
@@ -0,0 +1 @@
+register_project_for_upgrade neutron-vpnaas
diff --git a/devstack/upgrade/shutdown.sh b/devstack/upgrade/shutdown.sh
index 328de37a0..acb36aaf1 100755
--- a/devstack/upgrade/shutdown.sh
+++ b/devstack/upgrade/shutdown.sh
@@ -13,7 +13,24 @@
 # under the License.
 #
 # ``upgrade-neutron-vpnaas``
+set -o errexit
 source $GRENADE_DIR/grenaderc
 source $GRENADE_DIR/functions
+source $BASE_DEVSTACK_DIR/functions
+source $BASE_DEVSTACK_DIR/stackrc  # needed for status directory
+
+# TODO(kevinbenton): figure out best way to source this from devstack plugin
+function neutron_vpnaas_stop {
+    local ipsec_data_dir=$DATA_DIR/neutron/ipsec
+    local pids
+    if [ -d $ipsec_data_dir ]; then
+        pids=$(find $ipsec_data_dir -name 'pluto.pid' -exec cat {} \;)
+    fi
+    if [ -n "$pids" ]; then
+        sudo kill $pids
+    fi
+    stop_process neutron-vpnaas
+}
+ENABLED_SERVICES+=,neutron-vpnaas
 set -o xtrace
-neutron_vpnaas_stop
\ No newline at end of file
+neutron_vpnaas_stop