diff --git a/adminer/README-short.txt b/adminer/README-short.txt
new file mode 100644
index 000000000..b908ecebb
--- /dev/null
+++ b/adminer/README-short.txt
@@ -0,0 +1 @@
+Database management in a single PHP file.
diff --git a/adminer/content.md b/adminer/content.md
new file mode 100644
index 000000000..0267a0f36
--- /dev/null
+++ b/adminer/content.md
@@ -0,0 +1,44 @@
+# Adminer
+
+## What is Adminer?
+
+Adminer (formerly phpMinAdmin) is a full-featured database management tool written in PHP. Conversely to phpMyAdmin, it consist of a single file ready to deploy to the target server. Adminer is available for MySQL, PostgreSQL, SQLite, MS SQL, Oracle, Firebird, SimpleDB, Elasticsearch and MongoDB.
+
+> [adminer.org](https://www.adminer.org)
+
+%%LOGO%%
+
+## How to use this image
+
+### Standalone
+
+	$ docker run --link some_database:db -p 8080:8080 adminer
+
+Then you can hit `http://localhost:8080` or `http://host-ip:8080` in your browser.
+
+### FastCGI
+
+If you are already running a FastCGI capable web server you might prefer running adminer via FastCGI:
+
+	$ docker run --link some_database:db -p 9000:9000 adminer:fastcgi
+
+Then point your web server to port 9000 of the container.
+
+Note: This exposes the FastCGI socket to the Internet. Make sure to add proper firewall rules or use a private Docker network instead to prevent a direct access.
+
+## Supported Drivers
+
+While Adminer supports a wide range of database drivers this image only supports the following out of the box:
+
+-	MySQL
+-	PostgreSQL
+-	SQLite
+-	SimpleDB
+-	Elasticsearch
+
+To add support for the other drivers you will need to install the following PHP extensions on top of this image:
+
+-	sqlsrv (MS SQL)
+-	oci8 (Oracle)
+-	interbase (Firebird)
+-	mongo (MongoDB)
diff --git a/adminer/github-repo b/adminer/github-repo
new file mode 100644
index 000000000..4d6993077
--- /dev/null
+++ b/adminer/github-repo
@@ -0,0 +1 @@
+https://github.com/TimWolla/docker-adminer
diff --git a/adminer/license.md b/adminer/license.md
new file mode 100644
index 000000000..120e86ad3
--- /dev/null
+++ b/adminer/license.md
@@ -0,0 +1 @@
+View [license information](https://github.com/vrana/adminer/blob/master/readme.txt) for the software contained in this image.
diff --git a/adminer/logo.png b/adminer/logo.png
new file mode 100644
index 000000000..b53dde933
Binary files /dev/null and b/adminer/logo.png differ