diff --git a/tomcat/README-short.txt b/tomcat/README-short.txt
new file mode 100644
index 000000000..04f52dff0
--- /dev/null
+++ b/tomcat/README-short.txt
@@ -0,0 +1 @@
+Apache Tomcat is an open source implementation of the Java Servlet and JavaServer Pages technologies
diff --git a/tomcat/README.md b/tomcat/README.md
new file mode 100644
index 000000000..447deebea
--- /dev/null
+++ b/tomcat/README.md
@@ -0,0 +1,86 @@
+# Supported tags and respective `Dockerfile` links
+
+
+
+For more information about this image and its history, please see the [relevant
+manifest file
+(`library/tomcat`)](https://github.com/docker-library/official-images/blob/master/library/tomcat)
+in the [`docker-library/official-images` GitHub
+repo](https://github.com/docker-library/official-images).
+
+# What is Tomcat?
+
+Apache Tomcat (or simply Tomcat) is an open source web server and servlet
+container developed by the Apache Software Foundation (ASF). Tomcat implements
+the Java Servlet and the JavaServer Pages (JSP) specifications from Oracle, and
+provides a "pure Java" HTTP web server environment for Java code to run in. In
+the simplest config Tomcat runs in a single operating system process. The
+process runs a Java virtual machine (JVM). Every single HTTP request from a
+browser to Tomcat is processed in the Tomcat process in a separate thread.
+
+> [wikipedia.org/wiki/Apache_Tomcat](https://en.wikipedia.org/wiki/Apache_Tomcat)
+
+![logo](https://raw.githubusercontent.com/docker-library/docs/master/tomcat/logo.png)
+Logo © Apache Software Fountation
+
+# How to use this image.
+
+Run the default Tomcat server (`CMD ["catalina.sh", "run"]`):
+
+    docker run -it --rm tomcat:8.0
+
+You can test it by visiting `http://container-ip:8080` in a browser or, if you
+need access outside the host, on port 8888:
+
+    docker run -it --rm -p 8888:8080 tomcat:8.0
+
+You can then go to `http://localhost:8888` or `http://host-ip:8888` in a
+browser.
+
+The default Tomcat environment in the image for versions 7 and 8 is:
+
+    CATALINA_BASE:   /usr/local/tomcat
+    CATALINA_HOME:   /usr/local/tomcat
+    CATALINA_TMPDIR: /usr/local/tomcat/temp
+    JRE_HOME:        /usr
+    CLASSPATH:       /usr/local/tomcat/bin/bootstrap.jar:/usr/local/tomcat/bin/tomcat-juli.jar
+
+The default Tomcat environment in the image for version 6 is:
+
+    CATALINA_BASE:   /usr/local/tomcat
+    CATALINA_HOME:   /usr/local/tomcat
+    CATALINA_TMPDIR: /usr/local/tomcat/temp
+    JRE_HOME:        /usr
+    CLASSPATH:       /usr/local/tomcat/bin/bootstrap.jar
+
+The configuration files are available in `/usr/local/tomcat/conf/`.  By default,
+no user is included in the "manager-gui" role required to operate the
+"/manager/html" web application.   If you wish to use this app, you must define
+such a user in `tomcat-users.xml`.
+
+# License
+
+View [license information](https://www.apache.org/licenses/LICENSE-2.0) for the
+software contained in this image.
+
+# User Feedback
+
+## Issues
+
+If you have any problems with or questions about this image, please contact us
+ through a [GitHub issue](https://github.com/docker-library/tomcat/issues).
+
+You can also reach many of the official image maintainers via the
+`#docker-library` IRC channel on [Freenode](https://freenode.net).
+
+## Contributing
+
+You are invited to contribute new features, fixes, or updates, large or small;
+we are always thrilled to receive pull requests, and do our best to process them
+as fast as we can.
+
+Before you start to code, we recommend discussing your plans 
+through a [GitHub issue](https://github.com/docker-library/tomcat/issues), especially for more ambitious
+contributions. This gives other contributors a chance to point you in the right
+direction, give you feedback on your design, and help you find out if someone
+else is working on the same thing.
diff --git a/tomcat/content.md b/tomcat/content.md
new file mode 100644
index 000000000..ddac84917
--- /dev/null
+++ b/tomcat/content.md
@@ -0,0 +1,49 @@
+# What is Tomcat?
+
+Apache Tomcat (or simply Tomcat) is an open source web server and servlet
+container developed by the Apache Software Foundation (ASF). Tomcat implements
+the Java Servlet and the JavaServer Pages (JSP) specifications from Oracle, and
+provides a "pure Java" HTTP web server environment for Java code to run in. In
+the simplest config Tomcat runs in a single operating system process. The
+process runs a Java virtual machine (JVM). Every single HTTP request from a
+browser to Tomcat is processed in the Tomcat process in a separate thread.
+
+> [wikipedia.org/wiki/Apache_Tomcat](https://en.wikipedia.org/wiki/Apache_Tomcat)
+
+%%LOGO%%
+Logo © Apache Software Fountation
+
+# How to use this image.
+
+Run the default Tomcat server (`CMD ["catalina.sh", "run"]`):
+
+    docker run -it --rm tomcat:8.0
+
+You can test it by visiting `http://container-ip:8080` in a browser or, if you
+need access outside the host, on port 8888:
+
+    docker run -it --rm -p 8888:8080 tomcat:8.0
+
+You can then go to `http://localhost:8888` or `http://host-ip:8888` in a
+browser.
+
+The default Tomcat environment in the image for versions 7 and 8 is:
+
+    CATALINA_BASE:   /usr/local/tomcat
+    CATALINA_HOME:   /usr/local/tomcat
+    CATALINA_TMPDIR: /usr/local/tomcat/temp
+    JRE_HOME:        /usr
+    CLASSPATH:       /usr/local/tomcat/bin/bootstrap.jar:/usr/local/tomcat/bin/tomcat-juli.jar
+
+The default Tomcat environment in the image for version 6 is:
+
+    CATALINA_BASE:   /usr/local/tomcat
+    CATALINA_HOME:   /usr/local/tomcat
+    CATALINA_TMPDIR: /usr/local/tomcat/temp
+    JRE_HOME:        /usr
+    CLASSPATH:       /usr/local/tomcat/bin/bootstrap.jar
+
+The configuration files are available in `/usr/local/tomcat/conf/`.  By default,
+no user is included in the "manager-gui" role required to operate the
+"/manager/html" web application.   If you wish to use this app, you must define
+such a user in `tomcat-users.xml`.
diff --git a/tomcat/license.md b/tomcat/license.md
new file mode 100644
index 000000000..42aa1e15d
--- /dev/null
+++ b/tomcat/license.md
@@ -0,0 +1,2 @@
+View [license information](https://www.apache.org/licenses/LICENSE-2.0) for the
+software contained in this image.
diff --git a/tomcat/logo.png b/tomcat/logo.png
new file mode 100644
index 000000000..be586a03a
Binary files /dev/null and b/tomcat/logo.png differ