diff --git a/src/encoding/armor.js b/src/encoding/armor.js
index bc7abea4..6c175393 100644
--- a/src/encoding/armor.js
+++ b/src/encoding/armor.js
@@ -224,9 +224,12 @@ function splitHeaders(text) {
  */
 function verifyHeaders(headers) {
   for (var i = 0; i < headers.length; i++) {
-    if (!/^(Version|Comment|MessageID|Hash|Charset): .+$/.test(headers[i])) {
+    if (!/^[^:\s]+: .+$/.test(headers[i])) {
       throw new Error('Improperly formatted armor header: ' + headers[i]);
     }
+    if (config.debug && !/^(Version|Comment|MessageID|Hash|Charset): .+$/.test(headers[i])) {
+      console.log('Unknown header: ' + headers[i]);
+    }
   }
 }
 
diff --git a/test/general/armor.js b/test/general/armor.js
index 073c35a5..2644abea 100644
--- a/test/general/armor.js
+++ b/test/general/armor.js
@@ -104,7 +104,7 @@ describe("ASCII armor", function() {
     var msg = getArmor(['Hash:SHA256']);
     msg = openpgp.cleartext.readArmored.bind(null, msg);
     expect(msg).to.throw(Error, /Improperly formatted armor header/);
-    msg = getArmor(['<script>: SHA256']);
+    msg = getArmor(['Ha sh: SHA256']);
     msg = openpgp.cleartext.readArmored.bind(null, msg);
     expect(msg).to.throw(Error, /Improperly formatted armor header/);
     msg = getArmor(['Hash SHA256']);