diff --git a/tools/lint-all b/tools/lint-all
index fc42bfa214..d4a2460b23 100755
--- a/tools/lint-all
+++ b/tools/lint-all
@@ -46,7 +46,7 @@ puppet/puppet-common/tests/
 """.split()
 
 by_lang = lister.list_files(args, modified_only=options.modified, use_shebang=True,
-    ftypes=['py', 'sh', 'js', 'pp', 'css'], group_by_ftype=True, exclude=exclude)
+    ftypes=['py', 'sh', 'js', 'pp', 'css', 'handlebars'], group_by_ftype=True, exclude=exclude)
 
 # Invoke the appropriate lint checker for each language,
 # and also check files for extra whitespace.
@@ -147,6 +147,7 @@ bash_rules = [
      'description': 'Fix shebang line with proper call to /usr/bin/env for Bash path, change -x|-e switches to set -x|set -e'},
     ]
 css_rules = whitespace_rules
+handlebars_rules = whitespace_rules
 
 def check_custom_checks():
     failed = False
@@ -167,6 +168,10 @@ def check_custom_checks():
         if custom_check_file(fn, css_rules):
             failed = True
 
+    for fn in by_lang['handlebars']:
+        if custom_check_file(fn, handlebars_rules):
+            failed = True
+
     return failed
 
 lint_functions = {}