diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml
index 9c754c96..c9ab1b9d 100644
--- a/lib/linguist/languages.yml
+++ b/lib/linguist/languages.yml
@@ -591,6 +591,14 @@ Haml:
   type: markup
   primary_extension: .haml
 
+Handlebars:
+  type: markup
+  lexer: Text only
+  primary_extension: .handlebars
+  extensions:
+  - .handlebars
+  - .hbs
+
 Haskell:
   type: programming
   color: "#29b544"
diff --git a/samples/Handlebars/basic.handlebars b/samples/Handlebars/basic.handlebars
new file mode 100644
index 00000000..51364f83
--- /dev/null
+++ b/samples/Handlebars/basic.handlebars
@@ -0,0 +1,6 @@
+<div class="entry">
+  <h1>{{title}}</h1>
+  <div class="body">
+    {{body}}
+  </div>
+</div>
diff --git a/samples/Handlebars/each.hbs b/samples/Handlebars/each.hbs
new file mode 100644
index 00000000..b75afa61
--- /dev/null
+++ b/samples/Handlebars/each.hbs
@@ -0,0 +1,11 @@
+<div class="post">
+  <h1>By {{fullName author}}</h1>
+  <div class="body">{{body}}</div>
+
+  <h1>Comments</h1>
+
+  {{#each comments}}
+  <h2>By {{fullName author}}</h2>
+  <div class="body">{{body}}</div>
+  {{/each}}
+</div>