diff --git a/postfixadmin/README-short.txt b/postfixadmin/README-short.txt
new file mode 100644
index 000000000..6a67c823e
--- /dev/null
+++ b/postfixadmin/README-short.txt
@@ -0,0 +1 @@
+Postfix Admin - web based administration interface for Postfix mail servers.
diff --git a/postfixadmin/content.md b/postfixadmin/content.md
new file mode 100644
index 000000000..910bc4bdc
--- /dev/null
+++ b/postfixadmin/content.md
@@ -0,0 +1,73 @@
+# What is Postfix Admin?
+
+Postfix Admin is a web based interface to configure and manage a Postfix based email server for many users. Features include support for virtual domains and aliases, quotas, and vacation/out-of-the-office messages. It requires PHP, Postfix and one of MySQL, PostgreSQL or SQLite.
+
+%%LOGO%%
+
+# How to use this image
+
+## No config.local.php / no existing setup
+
+If you do not have a config.local.php, then we fall back to look for environment variables to generate one.
+
+```console
+$ docker run -e POSTFIXADMIN_DB_TYPE=mysqli \
+           -e POSTFIXADMIN_DB_HOST=whatever \
+           -e POSTFIXADMIN_DB_USER=user \
+           -e POSTFIXADMIN_DB_PASSWORD=topsecret \
+           -e POSTFIXADMIN_DB_NAME=postfixadmin \
+           --name some-%%REPO%% \
+        %%IMAGE%%
+```
+
+`POSTFIXADMIN_DB_TYPE` can be one of :
+
+-	mysqli
+-	pgsql
+-	sqlite
+
+Note: An SQLite database is not recommend but used as a fallback if you do not have a config.local.php and do not specify the above variables. Do not forget to add a volume for the SQLite path.
+
+You can also specify a `POSTFIXADMIN_SETUP_PASSWORD` environment variable.
+
+If you'd like to be able to access the instance from the host without the container's IP, standard port mappings can be used:
+
+```console
+$ docker run -e POSTFIXADMIN_DB_TYPE=mysqli \
+           -e POSTFIXADMIN_DB_HOST=whatever \
+           -e POSTFIXADMIN_DB_USER=user \
+           -e POSTFIXADMIN_DB_PASSWORD=topsecret \
+           -e POSTFIXADMIN_DB_NAME=postfixadmin \
+           --name some-%%REPO%% \
+           -p 8080:80
+        %%IMAGE%%
+```
+
+Then, access it via `http://localhost:8080` or `http://host-ip:8080` in a browser.
+
+## Existing config.local.php
+
+```console
+$ docker run --name some-%%REPO%% -p 8080:80 %%image%%
+$ docker run --name some-%%REPO%% -v /local/path/to/config.local.php:/var/www/html/config.local.php -p 8080:80 %%IMAGE%%
+```
+
+## Image Variants
+
+The following variants are currently provided:
+
+### apache
+
+This starts an Apache webserver with PHP, so you can use `postfixadmin` out of the box.
+
+### fpm-alpine
+
+This image has a very small footprint. It is based on Alpine Linux and starts only a PHP FPM process. Use this variant if you already have a seperate webserver. If you need more tools, that are not available on Alpine Linux, use the `fpm` image instead.
+
+### fpm
+
+This image starts only a PHP FPM container. Use this variant if you already have a seperate webserver.
+
+%%STACK%%
+
+Run docker stack deploy -c stack.yml %%REPO%% (or docker-compose -f stack.yml up), wait for it to initialize completely, and visit http://swarm-ip:8080, http://localhost:8080, or http://host-ip:8080 (as appropriate).
diff --git a/postfixadmin/github-repo b/postfixadmin/github-repo
new file mode 100644
index 000000000..ab9cbb2a2
--- /dev/null
+++ b/postfixadmin/github-repo
@@ -0,0 +1 @@
+https://github.com/postfixadmin/docker
diff --git a/postfixadmin/license.md b/postfixadmin/license.md
new file mode 100644
index 000000000..0b543b459
--- /dev/null
+++ b/postfixadmin/license.md
@@ -0,0 +1 @@
+View [license information](https://github.com/postfixadmin/postfixadmin/blob/master/LICENSE.TXT) for the software contained in this image.
diff --git a/postfixadmin/logo.png b/postfixadmin/logo.png
new file mode 100644
index 000000000..e10c3b47e
Binary files /dev/null and b/postfixadmin/logo.png differ
diff --git a/postfixadmin/maintainer.md b/postfixadmin/maintainer.md
new file mode 100644
index 000000000..674abee38
--- /dev/null
+++ b/postfixadmin/maintainer.md
@@ -0,0 +1 @@
+[Postfix Admin](%%GITHUB-REPO%%)
diff --git a/postfixadmin/stack.yml b/postfixadmin/stack.yml
new file mode 100644
index 000000000..d3cd8ec3a
--- /dev/null
+++ b/postfixadmin/stack.yml
@@ -0,0 +1,25 @@
+version: '3'
+
+services:
+  db:
+    image: mysql:5.7
+    restart: always
+    environment:
+      MYSQL_ROOT_PASSWORD: notSecureChangeMe
+      MYSQL_DATABASE: postfixadmin
+      MYSQL_USER: postfixadmin
+      MYSQL_PASSWORD: example
+
+  postfixadmin:
+    depends_on:
+      - db
+    image: postfixadmin
+    ports:
+      - 8000:80
+    restart: always
+    environment:
+      POSTFIXADMIN_DB_TYPE: mysqli
+      POSTFIXADMIN_DB_HOST: db
+      POSTFIXADMIN_DB_USER: postfixadmin
+      POSTFIXADMIN_DB_NAME: postfixadmin
+      POSTFIXADMIN_DB_PASSWORD: example