diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index d6549b2485..4003fa4903 100644
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -381,9 +381,12 @@ function stop_ceilometer {
     if [ "$CEILOMETER_USE_MOD_WSGI" == "True" ]; then
         disable_apache_site ceilometer
         restart_apache_server
+    else
+        stop_process ceilometer-api
     fi
+
     # Kill the ceilometer screen windows
-    for serv in ceilometer-acompute ceilometer-acentral ceilometer-aipmi ceilometer-anotification ceilometer-collector ceilometer-api ceilometer-alarm-notifier ceilometer-alarm-evaluator; do
+    for serv in ceilometer-acompute ceilometer-acentral ceilometer-aipmi ceilometer-anotification ceilometer-collector ceilometer-alarm-notifier ceilometer-alarm-evaluator; do
         stop_process $serv
     done
 }
diff --git a/devstack/upgrade/shutdown.sh b/devstack/upgrade/shutdown.sh
index 6db134e29b..391e13891f 100755
--- a/devstack/upgrade/shutdown.sh
+++ b/devstack/upgrade/shutdown.sh
@@ -7,15 +7,21 @@ set -o errexit
 source $GRENADE_DIR/grenaderc
 source $GRENADE_DIR/functions
 
-# We need base DevStack functions for this.
-# TODO(chdent): This relies on the fact that for now base devstack is
-# hosting ceilometer itself. Once M* starts this will need to be smarter.
 source $BASE_DEVSTACK_DIR/functions
 source $BASE_DEVSTACK_DIR/stackrc # needed for status directory
 source $BASE_DEVSTACK_DIR/lib/tls
 source $BASE_DEVSTACK_DIR/lib/apache
-source $BASE_DEVSTACK_DIR/lib/ceilometer
+
+# Locate the ceilometer plugin and get its functions
+CEILOMETER_DEVSTACK_DIR=$(dirname $(dirname $0))
+source $CEILOMETER_DEVSTACK_DIR/plugin.sh
 
 set -o xtrace
 
 stop_ceilometer
+
+# ensure everything is stopped
+
+SERVICES_DOWN="ceilometer-acompute ceilometer-acentral ceilometer-aipmi ceilometer-anotification ceilometer-collector ceilometer-api ceilometer-alarm-notifier ceilometer-alarm-evaluator"
+
+ensure_services_stopped $SERVICES_DOWN