diff --git a/lib/blocks.js b/lib/blocks.js
index a7f405f7..1a8419ab 100644
--- a/lib/blocks.js
+++ b/lib/blocks.js
@@ -16,16 +16,7 @@ var C_OPEN_BRACKET = 91;
 
 var InlineParser = require('./inlines');
 
-var reHtmlBlockOpen = [
-   /./, // dummy for 0
-   /^<(?:script|pre|style)(?:\s|>|$)/i,
-   /^<!--/,
-   /^<[?]/,
-   /^<![A-Z]/,
-   /^<!\[CDATA\[/,
-   /^<[/]?(?:address|article|aside|base|basefont|blockquote|body|caption|center|col|colgroup|dd|details|dialog|dir|div|dl|dt|fieldset|figcaption|figure|footer|form|frame|frameset|h1|head|header|hr|html|iframe|legend|li|link|main|menu|menuitem|meta|nav|noframes|ol|optgroup|option|p|param|section|source|title|summary|table|tbody|td|tfoot|th|thead|title|tr|track|ul)(?:\s|[/]?[>]|$)/i,
-    new RegExp('^(?:' + OPENTAG + '|' + CLOSETAG + ')\s*$', 'i')
-];
+var reHtmlBlockOpen = require('./common').reHtmlBlockOpen;
 
 var reHtmlBlockClose = [
    /./, // dummy for 0
diff --git a/lib/common.js b/lib/common.js
index 605a3bf7..095dd569 100644
--- a/lib/common.js
+++ b/lib/common.js
@@ -21,12 +21,23 @@ var OPENTAG = "<" + TAGNAME + ATTRIBUTE + "*" + "\\s*/?>";
 var CLOSETAG = "</" + TAGNAME + "\\s*[>]";
 var HTMLCOMMENT = "<!---->|<!--(?:-?[^>-])(?:-?[^-])*-->";
 var PROCESSINGINSTRUCTION = "[<][?].*?[?][>]";
-var DECLARATION = "<![A-Z]+" + "\\s+[^>]*>";
+var DECLARATION = "<![A-Za-z]+" + "\\s+[^>]*>";
 var CDATA = "<!\\[CDATA\\[[\\s\\S]*?\\]\\]>";
 var HTMLTAG = "(?:" + OPENTAG + "|" + CLOSETAG + "|" + HTMLCOMMENT + "|" +
         PROCESSINGINSTRUCTION + "|" + DECLARATION + "|" + CDATA + ")";
 var reHtmlTag = new RegExp('^' + HTMLTAG, 'i');
 
+var reHtmlBlockOpen = [
+   /./, // dummy for 0
+   /^<(?:script|pre|style)(?:\s|>|$)/i,
+   /^<!--/,
+   /^<[?]/,
+   /^<![A-Za-z]/,
+   /^<!\[CDATA\[/,
+   /^<[/]?(?:address|article|aside|base|basefont|blockquote|body|caption|center|col|colgroup|dd|details|dialog|dir|div|dl|dt|fieldset|figcaption|figure|footer|form|frame|frameset|h1|head|header|hr|html|iframe|legend|li|link|main|menu|menuitem|meta|nav|noframes|ol|optgroup|option|p|param|section|source|title|summary|table|tbody|td|tfoot|th|thead|title|tr|track|ul)(?:\s|[/]?[>]|$)/i,
+    new RegExp('^(?:' + OPENTAG + '|' + CLOSETAG + ')\s*$', 'i')
+];
+
 var reBackslashOrAmp = /[\\&]/;
 
 var ESCAPABLE = '[!"#$%&\'()*+,./:;<=>?@[\\\\\\]^_`{|}~-]';
@@ -96,6 +107,7 @@ module.exports = { unescapeString: unescapeString,
                    normalizeURI: normalizeURI,
                    escapeXml: escapeXml,
                    reHtmlTag: reHtmlTag,
+                   reHtmlBlockOpen: reHtmlBlockOpen,
                    OPENTAG: OPENTAG,
                    CLOSETAG: CLOSETAG,
                    ENTITY: ENTITY,
diff --git a/lib/inlines.js b/lib/inlines.js
index 96954864..001ddbca 100644
--- a/lib/inlines.js
+++ b/lib/inlines.js
@@ -10,6 +10,12 @@ var fromCodePoint = require('./from-code-point.js');
 var decodeHTML = require('entities').decodeHTML;
 require('string.prototype.repeat'); // Polyfill for String.prototype.repeat
 
+var reHtmlBlockOpen = require('./common').reHtmlBlockOpen.slice(0);
+
+// match on inline element names
+reHtmlBlockOpen[6] = 
+   /^<[/]?(?:big|small|tt|abbr|acronym|cite|code|dfn|em|kbd|strong|samp|time|var|bdo|br|img|map|object|script|span|sub|sup|button|input|label|select|textarea|b|i|a|q)(?:\s|[/]?[>]|$)/i;
+
 // Constants for character codes:
 
 var C_NEWLINE = 10;
@@ -213,6 +219,15 @@ var parseHtmlTag = function(block) {
         var node = new Node('html_inline');
         node._literal = m;
         block.appendChild(node);
+
+        var blockType;
+        for (blockType = 1; blockType < 7; blockType++) {
+            if(reHtmlBlockOpen[blockType].test(m)) {
+              node._htmlBlockType = blockType;
+              break;
+            }
+        }
+
         return true;
     }
 };