diff --git a/lib/marked.js b/lib/marked.js
index 92b9a154..5767d598 100644
--- a/lib/marked.js
+++ b/lib/marked.js
@@ -17,7 +17,7 @@ var block = {
   lheading: /^([^\n]+)\n *(=|-){3,}/,
   blockquote: /^ *>[^\n]*(?:\n *>[^\n]*)*/,
   list: /^( *)([*+-]|\d+\.) [^\0]+?(?:\n{2,}(?! )|\s*$)(?!\1\2|\1\d+\.)/,
-  html: /^ *(?:<!--[^\0]*?-->|<(\w+)[^\0]+?<\/\1>|<[^<>\n]+>) *(?:\n{2,}|\s*$)/,
+  html: /^ *(?:<!--[^\0]*?-->|<(\w+)[^\0]+?<\/\1>|<\w+[^>]*>) *(?:\n{2,}|\s*$)/,
   text: /^[^\n]+/
 };
 
@@ -181,7 +181,7 @@ block.token = function(str, tokens) {
 var inline = {
   escape: /^\\([\\`*{}\[\]()#+\-.!_])/,
   autolink: /^<([^ >]+(@|:\/)[^ >]+)>/,
-  tag: /^<!--[^\0]*?-->|^<[^\n>]+>/,
+  tag: /^<!--[^\0]*?-->|^<\/?\w+[^>]*>/,
   link: /^!?\[((?:\[[^\]]*\]|[^\[\]])*)\]\s*\(([^\)]*)\)/,
   reflink: /^!?\[((?:\[[^\]]*\]|[^\[\]])*)\]\s*\[([^\]]*)\]/,
   nolink: /^!?\[((?:\[[^\]]*\]|[^\[\]])*)\]/,