diff --git a/configure.ac b/configure.ac
index 46a0aade5..be1079102 100644
--- a/configure.ac
+++ b/configure.ac
@@ -259,7 +259,7 @@ GNUPG_GPG_DISABLE_ALGO([camellia192],[CAMELLIA192 cipher])
 GNUPG_GPG_DISABLE_ALGO([camellia256],[CAMELLIA256 cipher])
 
 GNUPG_GPG_DISABLE_ALGO([md5],[MD5 hash])
-# SHA1 is a MUSt algorithm
+# SHA1 is a MUST algorithm
 GNUPG_GPG_DISABLE_ALGO([rmd160],[RIPE-MD160 hash])
 GNUPG_GPG_DISABLE_ALGO([sha224],[SHA-224 hash])
 # SHA256 is a MUST algorithm for GnuPG.
diff --git a/g10/misc.c b/g10/misc.c
index 76faa49f6..320e8afbf 100644
--- a/g10/misc.c
+++ b/g10/misc.c
@@ -686,11 +686,7 @@ map_md_openpgp_to_gcry (digest_algo_t algo)
     case DIGEST_ALGO_SHA224: return 0;
 #endif
 
-#ifdef GPG_USE_SHA256
     case DIGEST_ALGO_SHA256: return GCRY_MD_SHA256;
-#else
-    case DIGEST_ALGO_SHA256: return 0;
-#endif
 
 #ifdef GPG_USE_SHA384
     case DIGEST_ALGO_SHA384: return GCRY_MD_SHA384;