diff --git a/etc/glance-api.conf b/etc/glance-api.conf
index 0c7d1f8b91..00f8c89bda 100644
--- a/etc/glance-api.conf
+++ b/etc/glance-api.conf
@@ -145,13 +145,11 @@ backlog = 4096
 #metadata_encryption_key = <16, 24 or 32 char registry metadata key>
 
 
-# Digest algorithm which will be used for digital signature, the default is
-# sha1 in Kilo for a smooth upgrade process, and it will be updated with
-# sha256 in next release(L). Use command
+# Digest algorithm which will be used for digital signature. Use the command
 # "openssl list-message-digest-algorithms" to get the available algorithms
 # supported by the version of OpenSSL on the platform. Examples are 'sha1',
 # 'sha256', 'sha512', etc.
-#digest_algorithm = sha1
+#digest_algorithm = sha256
 
 # ============ Registry Options ===============================
 
diff --git a/glance/common/config.py b/glance/common/config.py
index 6f2982ffca..ecd40a6e2a 100644
--- a/glance/common/config.py
+++ b/glance/common/config.py
@@ -167,15 +167,12 @@ common_opts = [
                       'This includes, if used, Swift or S3 credentials. '
                       'Should be set to a random string of length 16, 24 or '
                       '32 bytes')),
-    cfg.StrOpt('digest_algorithm', default='sha1',
+    cfg.StrOpt('digest_algorithm', default='sha256',
                help=_('Digest algorithm which will be used for digital '
-                      'signature; the default is sha1 the default in Kilo '
-                      'for a smooth upgrade process, and it will be updated '
-                      'with sha256 in next release(L). Use the command '
-                      '"openssl list-message-digest-algorithms" to get the '
-                      'available algorithms supported by the version of '
-                      'OpenSSL on the platform. Examples are "sha1", '
-                      '"sha256", "sha512", etc.')),
+                      'signature. Use the command "openssl list-message-'
+                      'digest-algorithms" to get the available algorithms'
+                      'supported by the version of OpenSSL on the platform.'
+                      ' Examples are "sha1", "sha256", "sha512", etc.')),
 ]
 
 CONF = cfg.CONF