diff --git a/keystone/conf/auth.py b/keystone/conf/auth.py
index 0ea6b1c68e..aac36d2bf9 100644
--- a/keystone/conf/auth.py
+++ b/keystone/conf/auth.py
@@ -64,6 +64,14 @@ namespace. You do not need to set this unless you are overriding keystone's own
 `oauth1` authentication plugin.
 """))
 
+mapped = cfg.StrOpt(
+    'mapped',
+    help=utils.fmt("""
+Entry point for the mapped auth plugin module in the `keystone.auth.mapped`
+namespace. You do not need to set this unless you are overriding keystone's own
+`mapped` authentication plugin.
+"""))
+
 GROUP_NAME = __name__.split('.')[-1]
 ALL_OPTS = [
     methods,
@@ -71,6 +79,7 @@ ALL_OPTS = [
     token,
     external,
     oauth1,
+    mapped,
 ]
 
 
diff --git a/keystone/conf/constants.py b/keystone/conf/constants.py
index 4a724be251..8304e769a4 100644
--- a/keystone/conf/constants.py
+++ b/keystone/conf/constants.py
@@ -17,7 +17,7 @@ package.
 """
 
 
-_DEFAULT_AUTH_METHODS = ['external', 'password', 'token', 'oauth1']
+_DEFAULT_AUTH_METHODS = ['external', 'password', 'token', 'oauth1', 'mapped']
 
 _CERTFILE = '/etc/keystone/ssl/certs/signing_cert.pem'
 _KEYFILE = '/etc/keystone/ssl/private/signing_key.pem'