diff --git a/data/Makefile.am b/data/Makefile.am
index 04dead33e9..f23104d751 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -37,6 +37,7 @@ filetypes = \
 	filedefs/filetypes.glsl \
 	filedefs/filetypes.go \
 	filedefs/filetypes.Graphviz.conf \
+	filedefs/filetypes.Groovy.conf \
 	filedefs/filetypes.haskell \
 	filedefs/filetypes.haxe \
 	filedefs/filetypes.html \
diff --git a/data/filedefs/filetypes.Groovy.conf b/data/filedefs/filetypes.Groovy.conf
new file mode 100644
index 0000000000..000854080c
--- /dev/null
+++ b/data/filedefs/filetypes.Groovy.conf
@@ -0,0 +1,30 @@
+[styling=C]
+stringeol=string_1
+
+[keywords]
+# http://docs.groovy-lang.org/docs/next/html/documentation/#_keywords
+primary=as assert break case catch class const continue def default do else enum extends false finally for goto if implements import in instanceof interface new null package return super switch this throw throws trait true try while
+# http://groovy-lang.org/objectorientation.html#_primitive_types
+secondary=boolean byte char double float int long short void
+# documentation keywords for javadoc
+doccomment=author deprecated exception param return see serial serialData serialField since throws todo version
+typedefs=
+
+[lexer_properties=C]
+lexer.cpp.allow.dollars=1
+lexer.cpp.triplequoted.strings=1
+
+[settings]
+lexer_filetype=C
+tag_parser=C++
+extension=groovy
+mime_type=text/x-groovy
+
+[build-menu]
+FT_00_LB=_Compile
+FT_00_CM=groovyc "%f"
+FT_00_WD=
+
+EX_00_LB=Execute _Script
+EX_00_CM=groovy "%f"
+EX_00_WD=
diff --git a/data/filetype_extensions.conf b/data/filetype_extensions.conf
index 4f0d309fe9..bee6e7f8b3 100644
--- a/data/filetype_extensions.conf
+++ b/data/filetype_extensions.conf
@@ -35,6 +35,7 @@ Genie=*.gs;
 GLSL=*.glsl;*.frag;*.vert;
 Go=*.go;
 Graphviz=*.gv;*.dot;
+Groovy=*.groovy;*.gradle;
 Haskell=*.hs;*.lhs;*.hs-boot;*.lhs-boot;
 Haxe=*.hx;
 HTML=*.htm;*.html;*.shtml;*.hta;*.htd;*.htt;*.cfm;*.tpl;
@@ -77,7 +78,7 @@ None=*;
 
 # Note: restarting is required after editing groups
 [Groups]
-Programming=Arduino;Clojure;CUDA;Cython;Genie;Kotlin;Scala;Swift;
+Programming=Arduino;Clojure;CUDA;Cython;Genie;Groovy;Kotlin;Scala;Swift;
 Script=Graphviz;
 Markup=
 Misc=JSON;