diff --git a/groovy.json b/groovy.json
index eccd9ab22c..09cf5ed29a 100644
--- a/groovy.json
+++ b/groovy.json
@@ -22,6 +22,9 @@
         "JDK": [
             "java/oraclejdk",
             "java/openjdk"
+        ],
+        "groovyserv": [
+            "groovyserv"
         ]
     },
     "checkver": {
diff --git a/groovyserv.json b/groovyserv.json
new file mode 100644
index 0000000000..ba9e937062
--- /dev/null
+++ b/groovyserv.json
@@ -0,0 +1,28 @@
+{
+    "homepage": "https://kobo.github.io/groovyserv/",
+    "version": "1.2.0",
+    "license": "Apache-2.0",
+    "url": "https://bitbucket.org/kobo/groovyserv-mirror/downloads/groovyserv-1.2.0-bin.zip",
+    "hash": "88a93e07ce18b7ea33f98dd75ce21550b3a25820dd6eb00ab790f16573317e93",
+    "extract_dir": "groovyserv-1.2.0",
+    "installer": {
+        "file": "bin\\setup.bat",
+        "keep": true
+    },
+    "bin": [
+        "bin\\groovyclient.exe",
+        "bin\\groovyserver.exe"
+    ],
+    "suggest": {
+        "Groovy": [
+            "groovy"
+        ]
+    },
+    "checkver": {
+        "github": "https://github.com/kobo/groovyserv"
+    },
+    "autoupdate": {
+        "url": "https://bitbucket.org/kobo/groovyserv-mirror/downloads/groovyserv-$version-bin.zip",
+        "extract_dir": "groovyserv-$version"
+    }
+}