diff --git a/HTML/Indentation Rules.tmPreferences b/HTML/Indentation Rules.tmPreferences
index 4445dc6d6a..b9b896259b 100644
--- a/HTML/Indentation Rules.tmPreferences	
+++ b/HTML/Indentation Rules.tmPreferences	
@@ -26,8 +26,9 @@
 			^.* (
 				# a valid non-self-closing HTML tag that doesn't close itself on the same line
 				<(?!
-					  !--   # no comment
-					| [?%]  # no section
+					  !--      # no comment
+					| [?%]     # no preprocessor section like PHP/ASP
+					| !DOCTYPE # no document type
 					| (?i:area|base|br|col|frame|hr|html|img|input|link|meta|param)[\t\n\f /<>]
 				)(?:
 					# tag name
diff --git a/HTML/syntax_test_html_indentation.html b/HTML/syntax_test_html_indentation.html
new file mode 100644
index 0000000000..f5c4d42fc3
--- /dev/null
+++ b/HTML/syntax_test_html_indentation.html
@@ -0,0 +1,24 @@
+## SYNTAX TEST reindent-unchanged "Packages/HTML/HTML.sublime-syntax"
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <title>Page Title Here</title>
+    <!-- this comment's
+        indentation should
+        be unchanged
+    -->
+</head>
+<body>
+
+    <div class="main">
+        <span class="something">Blah</span>
+        <span class="something">
+            Foobar
+        </span>
+    </div>
+
+    <script type="text/javascript" src="/some_script.js"></script>
+</body>
+</html>
