diff --git a/README.md b/README.md
index 7185e9da39..7eacebdc1e 100644
--- a/README.md
+++ b/README.md
@@ -143,6 +143,8 @@ mod_wsgi set ``ENABLE_HTTPD_MOD_WSGI_SERVICES`` to ``False`` in your
 Each service that can be run under HTTPD + mod_wsgi also has an override
 toggle available that can be set in your ``local.conf``.
 
+Keystone is run under HTTPD + mod_wsgi by default.
+
 Example (Keystone):
 
     KEYSTONE_USE_MOD_WSGI="True"
diff --git a/lib/keystone b/lib/keystone
index ec124cbaaa..86f1c37bc7 100644
--- a/lib/keystone
+++ b/lib/keystone
@@ -47,7 +47,7 @@ KEYSTONECLIENT_DIR=$DEST/python-keystoneclient
 KEYSTONE_EXTENSIONS=${KEYSTONE_EXTENSIONS:-}
 
 # Toggle for deploying Keystone under HTTPD + mod_wsgi
-KEYSTONE_USE_MOD_WSGI=${KEYSTONE_USE_MOD_WSGI:-False}
+KEYSTONE_USE_MOD_WSGI=${KEYSTONE_USE_MOD_WSGI:-${ENABLE_HTTPD_MOD_WSGI_SERVICES}}
 
 # Select the backend for Keystone's service catalog
 KEYSTONE_CATALOG_BACKEND=${KEYSTONE_CATALOG_BACKEND:-sql}