diff --git a/src/encoding/armor.js b/src/encoding/armor.js
index bc7abea4..7a077033 100644
--- a/src/encoding/armor.js
+++ b/src/encoding/armor.js
@@ -224,7 +224,7 @@ function splitHeaders(text) {
  */
 function verifyHeaders(headers) {
   for (var i = 0; i < headers.length; i++) {
-    if (!/^(Version|Comment|MessageID|Hash|Charset): .+$/.test(headers[i])) {
+    if (!/^[^: ]+: .+$/.test(headers[i])) {
       throw new Error('Improperly formatted armor header: ' + headers[i]);
     }
   }