diff --git a/devstack/settings b/devstack/settings
index 85ff436205..99be400b1f 100644
--- a/devstack/settings
+++ b/devstack/settings
@@ -31,15 +31,6 @@ enable_service h-api
 enable_service h-api-cfn
 enable_service h-api-cw
 
-# Enable Ceilometer services
-enable_service ceilometer-acompute
-enable_service ceilometer-acentral
-enable_service ceilometer-anotification
-enable_service ceilometer-collector
-enable_service ceilometer-api
-enable_service ceilometer-alarm-notifier
-enable_service ceilometer-alarm-evaluator
-
 # Enable Magnum services
 enable_service m-api
 enable_service m-cond
diff --git a/doc/source/dev/dev-quickstart.rst b/doc/source/dev/dev-quickstart.rst
index 2b32a6de2c..da92462975 100644
--- a/doc/source/dev/dev-quickstart.rst
+++ b/doc/source/dev/dev-quickstart.rst
@@ -121,6 +121,13 @@ Kilo, and heat is enabled by the magnum plugin)::
 
 Note: Update PUBLIC_INTERFACE as appropriate for your system.
 
+Optionally, you can enable ceilometer in devstack. If ceilometer is enabled,
+magnum will periodically send metrics to ceilometer::
+
+    cat >> /opt/stack/devstack/local.conf << END
+    enable_plugin ceilometer https://git.openstack.org/openstack/ceilometer
+    END
+
 More devstack configuration information can be found at
 http://docs.openstack.org/developer/devstack/configuration.html