diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml
index 5400e536..02170a79 100644
--- a/lib/linguist/languages.yml
+++ b/lib/linguist/languages.yml
@@ -1268,6 +1268,14 @@ Groovy Server Pages:
   tm_scope: text.html.jsp
   ace_mode: jsp
 
+HCL:
+  type: programming
+  extensions:
+    - .hcl
+    - .tf
+  ace_mode: javascript
+  tm_scope: source.json
+
 HTML:
   type: markup
   tm_scope: text.html.basic
diff --git a/samples/HCL/example.hcl b/samples/HCL/example.hcl
new file mode 100644
index 00000000..276b171e
--- /dev/null
+++ b/samples/HCL/example.hcl
@@ -0,0 +1,6 @@
+consul = "1.2.3.4"
+
+// This is a comment
+template "foo" {
+  bar = "zip"
+}
diff --git a/samples/HCL/example.tf b/samples/HCL/example.tf
new file mode 100644
index 00000000..976c2e07
--- /dev/null
+++ b/samples/HCL/example.tf
@@ -0,0 +1,13 @@
+resource "aws_instance" "web" {
+  // Copies the myapp.conf file to /etc/myapp.conf
+  provisioner "file" {
+    source = "conf/myapp.conf"
+    destination = "/etc/myapp.conf"
+  }
+
+  // Copies the configs.d folder to /etc/configs.d
+  provisioner "file" {
+    source = "conf/configs.d"
+    destination = "/etc"
+  }
+}