diff --git a/optlib/puppetManifest.c b/optlib/puppetManifest.c
index e04e04cf78..2a39fc8611 100644
--- a/optlib/puppetManifest.c
+++ b/optlib/puppetManifest.c
@@ -462,32 +462,32 @@ static void initializePuppetManifestParser (const langType language CTAGS_ATTR_U
 	                               "^",
 	                               "", "", "{tquit}", NULL);
 	addLanguageTagMultiTableRegex (language, "resourceBody",
-	                               "^/\\*",
-	                               "", "", "{tenter=comment_multiline}", NULL);
-	addLanguageTagMultiTableRegex (language, "resourceBody",
-	                               "^\\#",
-	                               "", "", "{tenter=comment_oneline}", NULL);
-	addLanguageTagMultiTableRegex (language, "resourceBody",
-	                               "^[ \t\n]",
+	                               "^([^/#{'\";}<])",
 	                               "", "", "", NULL);
-	addLanguageTagMultiTableRegex (language, "resourceBody",
-	                               "^\\{",
-	                               "", "", "{tenter=skipBlock}", NULL);
 	addLanguageTagMultiTableRegex (language, "resourceBody",
 	                               "^'",
 	                               "", "", "{tenter=ssliteral}", NULL);
 	addLanguageTagMultiTableRegex (language, "resourceBody",
 	                               "^\"",
 	                               "", "", "{tenter=dsliteral}", NULL);
-	addLanguageTagMultiTableRegex (language, "resourceBody",
-	                               "^;",
-	                               "", "", "{tleave}{scope=pop}", NULL);
 	addLanguageTagMultiTableRegex (language, "resourceBody",
 	                               "^\\}",
 	                               "", "", "{tleave}{_advanceTo=0start}{scope=pop}", NULL);
+	addLanguageTagMultiTableRegex (language, "resourceBody",
+	                               "^\\{",
+	                               "", "", "{tenter=skipBlock}", NULL);
+	addLanguageTagMultiTableRegex (language, "resourceBody",
+	                               "^;",
+	                               "", "", "{tleave}{scope=pop}", NULL);
 	addLanguageTagMultiTableRegex (language, "resourceBody",
 	                               "^<<?\\|",
 	                               "", "", "{tenter=skipCollector}", NULL);
+	addLanguageTagMultiTableRegex (language, "resourceBody",
+	                               "^/\\*",
+	                               "", "", "{tenter=comment_multiline}", NULL);
+	addLanguageTagMultiTableRegex (language, "resourceBody",
+	                               "^\\#",
+	                               "", "", "{tenter=comment_oneline}", NULL);
 	addLanguageTagMultiTableRegex (language, "resourceBody",
 	                               "^.",
 	                               "", "", "", NULL);
diff --git a/optlib/puppetManifest.ctags b/optlib/puppetManifest.ctags
index ccb0254b17..52e51152e0 100644
--- a/optlib/puppetManifest.ctags
+++ b/optlib/puppetManifest.ctags
@@ -236,14 +236,18 @@
 --_mtable-regex-PuppetManifest=resourceNameInArray/"([^"]+)"/\1/r/{tleave}
 --_mtable-regex-PuppetManifest=resourceNameInArray////{tquit}
 
---_mtable-extend-PuppetManifest=resourceBody+comment
---_mtable-extend-PuppetManifest=resourceBody+ignoreWhiteSpace
---_mtable-regex-PuppetManifest=resourceBody/\{//{tenter=skipBlock}
+# --_mtable-extend-PuppetManifest=resourceBody+ignoreWhiteSpace
+#
+# Next pattern is just for optimization.
+#
+--_mtable-regex-PuppetManifest=resourceBody/([^\/#{'";}<])//
 --_mtable-regex-PuppetManifest=resourceBody/'//{tenter=ssliteral}
 --_mtable-regex-PuppetManifest=resourceBody/"//{tenter=dsliteral}
---_mtable-regex-PuppetManifest=resourceBody/;//{tleave}{scope=pop}
 --_mtable-regex-PuppetManifest=resourceBody/\}//{tleave}{_advanceTo=0start}{scope=pop}
+--_mtable-regex-PuppetManifest=resourceBody/\{//{tenter=skipBlock}
+--_mtable-regex-PuppetManifest=resourceBody/;//{tleave}{scope=pop}
 --_mtable-regex-PuppetManifest=resourceBody/<<?\|//{tenter=skipCollector}
+--_mtable-extend-PuppetManifest=resourceBody+comment
 --_mtable-extend-PuppetManifest=resourceBody+any
 
 --_mtable-extend-PuppetManifest=resourceArray+comment