diff --git a/groovy/README-short.txt b/groovy/README-short.txt
new file mode 100644
index 000000000..43c418309
--- /dev/null
+++ b/groovy/README-short.txt
@@ -0,0 +1 @@
+Apache Groovy is a multi-faceted language for the Java platform.
diff --git a/groovy/content.md b/groovy/content.md
new file mode 100644
index 000000000..d7a9276a3
--- /dev/null
+++ b/groovy/content.md
@@ -0,0 +1,15 @@
+# What is Groovy?
+
+[Apache Groovy](http://groovy-lang.org/) is a powerful, optionally typed and dynamic language, with static-typing and static compilation capabilities, for the Java platform aimed at improving developer productivity thanks to a concise, familiar and easy to learn syntax. It integrates smoothly with any Java program, and immediately delivers to your application powerful features, including scripting capabilities, Domain-Specific Language authoring, runtime and compile-time meta-programming and functional programming.
+
+%%LOGO%%
+
+# How to use this image
+
+## Starting Groovysh
+
+`docker run -it --rm --name groovy groovy:alpine`
+
+## Running a Groovy script
+
+`docker run --rm -v "$PWD":/scripts -w /scripts --name groovy groovy:alpine groovy <script> <script-args>`
diff --git a/groovy/github-repo b/groovy/github-repo
new file mode 100644
index 000000000..082363b65
--- /dev/null
+++ b/groovy/github-repo
@@ -0,0 +1 @@
+https://github.com/groovy/docker-groovy
diff --git a/groovy/license.md b/groovy/license.md
new file mode 100644
index 000000000..96e6afdc6
--- /dev/null
+++ b/groovy/license.md
@@ -0,0 +1 @@
+View [license information](http://www.apache.org/licenses/LICENSE-2.0.html) for the software contained in this image.
diff --git a/groovy/logo.png b/groovy/logo.png
new file mode 100644
index 000000000..54af4c185
Binary files /dev/null and b/groovy/logo.png differ