diff --git a/etc/keystone.conf.sample b/etc/keystone.conf.sample
index 3f37c713d1..9061fe0827 100644
--- a/etc/keystone.conf.sample
+++ b/etc/keystone.conf.sample
@@ -95,7 +95,7 @@
 #certfile = /etc/keystone/ssl/certs/signing_cert.pem
 #keyfile = /etc/keystone/ssl/private/signing_key.pem
 #ca_certs = /etc/keystone/ssl/certs/ca.pem
-#key_size = 2048
+#key_size = 1024
 #valid_days = 3650
 #ca_password = None
 
diff --git a/keystone/config.py b/keystone/config.py
index 33f1e3bab1..04839f137e 100644
--- a/keystone/config.py
+++ b/keystone/config.py
@@ -133,7 +133,7 @@ register_str('keyfile', group='signing',
              default="/etc/keystone/ssl/private/signing_key.pem")
 register_str('ca_certs', group='signing',
              default="/etc/keystone/ssl/certs/ca.pem")
-register_int('key_size', group='signing', default=2048)
+register_int('key_size', group='signing', default=1024)
 register_int('valid_days', group='signing', default=3650)
 register_str('ca_password', group='signing', default=None)