diff --git a/gazebo/README-short.txt b/gazebo/README-short.txt
new file mode 100644
index 000000000..8f5509b5e
--- /dev/null
+++ b/gazebo/README-short.txt
@@ -0,0 +1 @@
+Gazebo is an open source project for simulating robots, offering robust physics and rendering.
diff --git a/gazebo/README.md b/gazebo/README.md
new file mode 100644
index 000000000..411865033
--- /dev/null
+++ b/gazebo/README.md
@@ -0,0 +1,15 @@
+# Supported tags and respective `Dockerfile` links
+
+%%TAGS%%
+
+For more information about this image and its history, please see the [relevant manifest file (`library/%%REPO%%`)](https://github.com/docker-library/official-images/blob/master/library/%%REPO%%) in the [`docker-library/official-images` GitHub repo](https://github.com/docker-library/official-images).
+
+%%CONTENT%%%%VARIANT%%%%LICENSE%%
+
+# Supported Docker versions
+
+%%DOCKER-VERSIONS%%
+
+# User Feedback
+
+%%USER-FEEDBACK%%
diff --git a/gazebo/content.md b/gazebo/content.md
new file mode 100644
index 000000000..8faa1386e
--- /dev/null
+++ b/gazebo/content.md
@@ -0,0 +1,30 @@
+# What is [Gazebo](http://www.gazebosim.org/)?
+
+Robot simulation is an essential tool in every roboticist's toolbox. A well-designed simulator makes it possible to rapidly test algorithms, design robots, and perform regression testing using realistic scenarios. Gazebo offers the ability to accurately and efficiently simulate populations of robots in complex indoor and outdoor environments. At your fingertips is a robust physics engine, high-quality graphics, and convenient programmatic interfaces. Best of all, Gazebo is free with a vibrant community.
+
+> [wikipedia.org/wiki/Gazebo_simulator ](https://en.wikipedia.org/wiki/Gazebo_simulator)
+
+[%%LOGO%%](http://www.gazebosim.org/)
+
+# How to use this image
+
+## Create a `Dockerfile` in your Gazebo project
+
+	FROM gazebo:gzserver5
+	# place here your application's setup specifics
+	CMD [ "gzserver", "my-gazebo-app-args" ]
+
+You can then build and run the Docker image:
+
+	docker build -t my-gazebo-app .
+	docker run -it --rm --name my-running-app my-gazebo-app
+
+# More Resources
+
+[Gazebosim.org](http://www.gazebosim.org/): Main Gazebo website  
+[Answers](http://answers.gazebosim.org/): Find answers and ask questions  
+[Wiki](https://bitbucket.org/osrf/gazebo/wiki): General information and tutorials  
+[Mailing List](https://groups.google.com/a/osrfoundation.org/d/forum/gazebo): Join for news and announcements  
+[Simulation Models](https://bitbucket.org/osrf/gazebo_models/src): Robots, objects, and other simulation models  
+[Blog](http://wiki.gazebosim.org/blog.html): Stay up-to-date  
+[OSRF](http://www.osrfoundation.org/): Open Source Robotics Foundation  
diff --git a/gazebo/license.md b/gazebo/license.md
new file mode 100644
index 000000000..620846f3d
--- /dev/null
+++ b/gazebo/license.md
@@ -0,0 +1 @@
+Gazebo is open-source licensed under [Apache 2.0](http://opensource.org/licenses/Apache-2.0).
diff --git a/gazebo/logo.png b/gazebo/logo.png
new file mode 100644
index 000000000..a641b1a68
Binary files /dev/null and b/gazebo/logo.png differ
diff --git a/update.sh b/update.sh
index 8cc475334..d672cf477 100755
--- a/update.sh
+++ b/update.sh
@@ -32,6 +32,7 @@ declare -A otherRepos=(
 	[debian]='https://github.com/tianon/docker-brew-debian'
 	[docker-dev]='https://github.com/docker/docker'
 	[fedora]='https://github.com/lsm5/docker-brew-fedora'
+	[gazebo]='https://github.com/osrf/docker_images'
 	[glassfish]='https://github.com/aws/aws-eb-glassfish'
 	[haskell]='https://github.com/freebroccolo/docker-haskell'
 	[hipache]='https://github.com/dotcloud/hipache'