diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml
index 117b38f0..8da5cf77 100644
--- a/lib/linguist/languages.yml
+++ b/lib/linguist/languages.yml
@@ -820,6 +820,9 @@ Groovy:
   color: "#e69f56"
   extensions:
   - .groovy
+  - .grt
+  - .gtpl
+  - .gvy
   interpreters:
   - groovy
 
diff --git a/samples/Groovy/script.gvy b/samples/Groovy/script.gvy
new file mode 100644
index 00000000..25ef2eab
--- /dev/null
+++ b/samples/Groovy/script.gvy
@@ -0,0 +1,2 @@
+#!/usr/bin/env groovy
+println "Hello World"
diff --git a/samples/Groovy/template.grt b/samples/Groovy/template.grt
new file mode 100644
index 00000000..59bb9c22
--- /dev/null
+++ b/samples/Groovy/template.grt
@@ -0,0 +1,9 @@
+html {
+  head {
+    component "bootstrap"
+    title "Bootstrap Template"
+  }
+  
+  html {
+  }
+}
diff --git a/samples/Groovy/template.gtpl b/samples/Groovy/template.gtpl
new file mode 100644
index 00000000..f2e594d1
--- /dev/null
+++ b/samples/Groovy/template.gtpl
@@ -0,0 +1,9 @@
+html {
+  head {
+    title "Example Template"
+  }
+  
+  body {
+    p "This is a quick template example"
+  }
+}