diff --git a/g10/ChangeLog b/g10/ChangeLog
index 19e4867ad..940cfe06d 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,3 +1,10 @@
+2007-10-21  David Shaw  <dshaw@jabberwocky.com>
+
+	* misc.c (compliance_option_string, compliance_failure): Minor
+	cleanup.
+
+	* armor.c (is_armor_header): Comment about 4880.
+
 2007-10-17  David Shaw  <dshaw@jabberwocky.com>
 
 	* options.h, gpg.c (main), misc.c (compliance_option_string): Add
diff --git a/g10/armor.c b/g10/armor.c
index 00139a132..4dff04245 100644
--- a/g10/armor.c
+++ b/g10/armor.c
@@ -356,7 +356,8 @@ is_armor_header( byte *line, unsigned len )
        --rfc2440 is set since 2440 reads "The header lines, therefore,
        MUST start at the beginning of a line, and MUST NOT have text
        following them on the same line."  It is unclear whether "text"
-       refers to all text or just non-whitespace text. */
+       refers to all text or just non-whitespace text.  4880 clarified
+       this was only non-whitespace text. */
 
     if(RFC2440)
       {
diff --git a/g10/misc.c b/g10/misc.c
index 16cde8825..21896c349 100644
--- a/g10/misc.c
+++ b/g10/misc.c
@@ -799,51 +799,64 @@ default_compress_algo(void)
 const char *
 compliance_option_string(void)
 {
-  switch(opt.compliance)
-    {
-    case CO_RFC4880:
-      return "--openpgp";
-    case CO_RFC2440:
-      return "--rfc2440";
-    case CO_RFC1991:
-      return "--rfc1991";
-    case CO_PGP2:
-      return "--pgp2";
-    case CO_PGP6:
-      return "--pgp6";
-    case CO_PGP7:
-      return "--pgp7";
-    case CO_PGP8:
-      return "--pgp8";
-    default:
-      return "???";
-    }
-}
+  char *ver="???";
 
-static const char *
-compliance_string(void)
-{
   switch(opt.compliance)
     {
-    case CO_RFC2440:
-      return "OpenPGP";
-    case CO_PGP2:
-      return "PGP 2.x";
-    case CO_PGP6:
-      return "PGP 6.x";
-    case CO_PGP7:
-      return "PGP 7.x";
-    case CO_PGP8:
-      return "PGP 8.x";
-    default:
-      return "???";
+    case CO_GNUPG:   return "--gnupg";
+    case CO_RFC4880: return "--openpgp";
+    case CO_RFC2440: return "--rfc2440";
+    case CO_RFC1991: return "--rfc1991";
+    case CO_PGP2:    return "--pgp2";
+    case CO_PGP6:    return "--pgp6";
+    case CO_PGP7:    return "--pgp7";
+    case CO_PGP8:    return "--pgp8";
     }
+
+  return ver;
 }
 
 void
 compliance_failure(void)
 {
-  log_info(_("this message may not be usable by %s\n"),compliance_string());
+  char *ver="???";
+
+  switch(opt.compliance)
+    {
+    case CO_GNUPG:
+      ver="GnuPG";
+      break;
+
+    case CO_RFC4880:
+      ver="OpenPGP";
+      break;
+
+    case CO_RFC2440:
+      ver="OpenPGP (older)";
+      break;
+
+    case CO_RFC1991:
+      ver="old PGP";
+      break;
+
+    case CO_PGP2:
+      ver="PGP 2.x";
+      break;
+
+    case CO_PGP6:
+      ver="PGP 6.x";
+      break;
+
+    case CO_PGP7:
+      ver="PGP 7.x";
+      break;
+
+    case CO_PGP8:
+      ver="PGP 8.x";
+      break;
+    }
+
+  log_info(_("this message may not be usable by %s\n"),ver);
   opt.compliance=CO_GNUPG;
 }