diff --git a/postgresql/Dockerfile b/postgresql/Dockerfile
index c10f2e6e..0ef86903 100644
--- a/postgresql/Dockerfile
+++ b/postgresql/Dockerfile
@@ -1,4 +1,4 @@
-FROM index.docker.io/fedora:23
+FROM index.docker.io/fedora:24
 MAINTAINER Pavel Raiskup <praiskup@redhat.com>
 
 ENV container="docker"
@@ -14,7 +14,7 @@ RUN dnf -y --setopt=tsflags=nodocs install postgresql-server \
 ADD "root" \
     "/"
 
-RUN systemctl disable getty.service console-getty.service \
+RUN systemctl disable console-getty.service \
     && systemctl enable postgresql-container.service \
     && touch /var/lib/pgsql/data/.container_internal && chown 26:26 /var/lib/pgsql/data \
     && container-build && rm /usr/bin/container-build
diff --git a/postgresql/cont-postgresql b/postgresql/cont-postgresql
index e884da27..ac9f79d0 160000
--- a/postgresql/cont-postgresql
+++ b/postgresql/cont-postgresql
@@ -1 +1 @@
-Subproject commit e884da27dd7d36e3cf2d16be3d30f4d39343b6d2
+Subproject commit ac9f79d0d6bb9345878415e356fec9dc1a1bd02e
diff --git a/postgresql/root/usr/lib/systemd/system/postgresql-container.service b/postgresql/root/usr/lib/systemd/system/postgresql-container.service
index 74ce3e47..e7df103f 100644
--- a/postgresql/root/usr/lib/systemd/system/postgresql-container.service
+++ b/postgresql/root/usr/lib/systemd/system/postgresql-container.service
@@ -14,7 +14,7 @@ User=postgres
 Group=postgres
 
 # Location of database directory
-Environment=PGDATA=/var/lib/pgsql/data
+Environment=PGDATA=/var/lib/pgsql/data/data
 
 # Where to send early-startup messages from the server (before the logging
 # options of postgresql.conf take effect)
diff --git a/postgresql/root/usr/share/cont-docs/postgresql.txt b/postgresql/root/usr/share/cont-docs/postgresql.txt
index 278e4388..5ba99989 100644
--- a/postgresql/root/usr/share/cont-docs/postgresql.txt
+++ b/postgresql/root/usr/share/cont-docs/postgresql.txt
@@ -2,14 +2,14 @@
 PostgreSQL in container
 =======================
 
-API Version:  1.0.1
+API Version:  1.0.2
 
 Documentation
 -------------
 
 You are encouraged to install this alias into your environment:
 
-  $ alias pgcont_help='docker run --rm THIS_IMAGE container-help --component postgresql'
+  $ alias pgcont_help='docker run --rm fedora/postgresql container-help --component postgresql'
 
 Please consult documentation for PostgreSQL component via:
 
diff --git a/postgresql/root/usr/share/cont-docs/postgresql/HOME.txt b/postgresql/root/usr/share/cont-docs/postgresql/HOME.txt
index 2b90fd3f..c5c4f485 100644
--- a/postgresql/root/usr/share/cont-docs/postgresql/HOME.txt
+++ b/postgresql/root/usr/share/cont-docs/postgresql/HOME.txt
@@ -6,7 +6,7 @@ General documentation for PostgreSQL container usage.  Most of this
 documentation describes only proof-of-concept implemented ideas.  Be careful not
 to rely described API too much because it is still expected to change very fast.
 
-Note that this is for 1.0.1 API
+Note that this is for 1.0.2 API
 (MAJOR.MINOR.FIX).  Any change in MAJOR part of version introduces backward
 incompatibility (you should take into account that interchanging MAJOR container
 with MAJOR+N container will need some manual changes in your tooling).  On the
diff --git a/postgresql/root/usr/share/cont-docs/postgresql/NEWS.txt b/postgresql/root/usr/share/cont-docs/postgresql/NEWS.txt
index 3883645f..63cfa24e 100644
--- a/postgresql/root/usr/share/cont-docs/postgresql/NEWS.txt
+++ b/postgresql/root/usr/share/cont-docs/postgresql/NEWS.txt
@@ -1,3 +1,14 @@
+News in 1.0.2
+
+* New features:
+
+  - the default help message is able to reference appropriate image name
+
+* Bugfixes:
+
+  - running via containerized systemd again works, this is better documented
+
+
 New in 1.0.1
 
 * dnf reinstall fails if the package has been updated in the meantime,
diff --git a/postgresql/root/usr/share/cont-docs/postgresql/advanced.txt b/postgresql/root/usr/share/cont-docs/postgresql/advanced.txt
index 47c481a3..bf5d68ba 100644
--- a/postgresql/root/usr/share/cont-docs/postgresql/advanced.txt
+++ b/postgresql/root/usr/share/cont-docs/postgresql/advanced.txt
@@ -109,6 +109,26 @@ POSTGRESQL_PASSWORD=STRING
     by given user.
 
 
+Systemd-based image
+-------------------
+
+This image (fedora/postgresql) allows you to start multi-process
+container via systemd.  You can easily achive this by running:
+
+    $ docker run -it --rm -u root \
+        -v /run -v /tmp \
+        -v /sys/fs/cgroup:/sys/fs/cgroup:ro \
+        fedora/postgresql \
+        /usr/lib/systemd/systemd
+
+As you can see, the steps that you need to do (compared with regular docker-run
+command for fedora/postgresql) is to:
+
+    - mount some additional directories into container
+    - specify that you wan't to run the container as root
+    - specify /usr/lib/systemd/systemd docker's "main" command
+
+
 Usage on Atomic host (tech-preview feature, not supported)
 ----------------------------------------------------------
 
diff --git a/postgresql/update b/postgresql/update
index c6efa911..9f754043 100755
--- a/postgresql/update
+++ b/postgresql/update
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-version=1.0.1
+version=1.0.2
 
 clean()
 {
@@ -16,7 +16,7 @@ build()
     git pull
     git checkout v$version
     git submodule update --init
-    make DESTDIR=../
+    make DESTDIR=../ docker_main_tag=fedora/postgresql
 )
 
 clean