diff --git a/package.yml b/package.yml
--- a/package.yml
+++ b/package.yml
@@ -1,9 +1,9 @@
 name       : docker
-version    : 18.06.0
-release    : 15
+version    : 18.06.1
+release    : 16
 source     :
-    - https://github.com/docker/docker-ce/archive/v18.06.0-ce.tar.gz : 18754ecb38d7c210fb2b96ee618dc2bdf94e66cd501d4eef0c685903a83e8501
-    - git|https://github.com/docker/libnetwork.git : d00ceed44cc447c77f25cdf5d59e83163bdcb4c9
+    - https://github.com/docker/docker-ce/archive/v18.06.1-ce.tar.gz : 153cb489033686260dfe7a42acbdd1753d56f7a9c2d7ad90633f0c8cce563b23
+    - git|https://github.com/docker/libnetwork.git : a79d3687931697244b8e03485bf7b2042f8ec6b6
 license    : Apache-2.0
 component  : virt
 summary    : Open source application container engine
@@ -15,6 +15,7 @@
 builddeps  :
     - pkgconfig(devmapper)
     - btrfs-progs-devel
+    - go-md2man
     - golang
 rundeps    :
     - btrfs-progs
@@ -36,7 +37,7 @@
     # Build daemon
     export VERSION=${version}-ce
     pushd components/engine
-    export DOCKER_GITCOMMIT="f150324782643a5268a04e7d1a675587125da20e"
+    export DOCKER_GITCOMMIT="e68fc7a215d7133c34aa18e3b72b4a21fd0c6136"
     export AUTO_GOPATH=1
     ./hack/make.sh dynbinary
     popd
@@ -45,34 +46,38 @@
     ln -sv `pwd`/components/cli src/github.com/docker
     pushd components/cli
     ./scripts/build/dynbinary
+    popd
+
+    # Build manpages
+    components/cli/man/md2man-all.sh
 install    : |
     # Required directories
-    install -D -d -m 00755 $installdir/usr/bin
-    install -D -d -m 00755 $installdir/%libdir%/systemd/system
+    install -Ddm00755 $installdir/usr/bin
+    install -Ddm00755 $installdir/%libdir%/systemd/system
 
     # Install docker client
     pushd components/cli
-    install -m 00755 build/docker-linux-amd64 $installdir/usr/bin/docker
+    install -m00755 build/docker-linux-amd64 $installdir/usr/bin/docker
     popd
 
     # Main docker daemon
     pushd components/engine
-    install -m 00755 bundles/dynbinary-daemon/dockerd-${version}-ce $installdir/usr/bin/dockerd
+    install -m00755 bundles/dynbinary-daemon/dockerd-${version}-ce $installdir/usr/bin/dockerd
     popd
 
     # Now install proxy service
-    install -m 00755 $workdir/docker-proxy $installdir/usr/bin/docker-proxy
+    install -m00755 $workdir/docker-proxy $installdir/usr/bin/docker-proxy
 
     # Now install systemd units
-    install -m 00644 components/packaging/deb/systemd/docker.service $installdir/%libdir%/systemd/system/.
-    install -m 00644 components/packaging/deb/systemd/docker.socket $installdir/%libdir%/systemd/system/.
+    install -m00644 components/packaging/deb/systemd/docker.service $installdir/%libdir%/systemd/system/.
+    install -m00644 components/packaging/deb/systemd/docker.socket $installdir/%libdir%/systemd/system/.
 
     # Enable socket activation by default
-    install -D -d -m 00755 $installdir/%libdir%/systemd/system/sockets.target.wants
+    install -Ddm00755 $installdir/%libdir%/systemd/system/sockets.target.wants
     ln -sv ../docker.socket $installdir/%libdir%/systemd/system/sockets.target.wants/docker.socket
 
     # Add the docker group
-    install -D -m 00644 $pkgfiles/docker.sysusers $installdir/%libdir%/sysusers.d/docker.conf
+    install -Dm00644 $pkgfiles/docker.sysusers $installdir/%libdir%/sysusers.d/docker.conf
 
     # containerd integration
     ln -s containerd $installdir/usr/bin/docker-containerd
@@ -83,3 +88,8 @@
     # Install completions
     install -Dm00644 components/cli/contrib/completion/bash/docker $installdir/usr/share/bash-completion/completions/docker
     install -Dm00644 components/cli/contrib/completion/zsh/_docker $installdir/usr/share/zsh/site-functions/_docker
+
+    # Install manpages
+    for i in 1 5 8; do
+      install -Dm00644 components/cli/man/man$i/*.$i -t $installdir/usr/share/man/man$i
+    done
diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml
--- a/pspec_x86_64.xml
+++ b/pspec_x86_64.xml
@@ -2,8 +2,8 @@
     <Source>
         <Name>docker</Name>
         <Packager>
-            <Name>Sönke Behrendt</Name>
-            <Email>thesoenke@outlook.com</Email>
+            <Name>Philipp Trulson</Name>
+            <Email>philipp@trulson.de</Email>
         </Packager>
         <License>Apache-2.0</License>
         <PartOf>virt</PartOf>
@@ -35,16 +35,22 @@
             <Path fileType="library">/usr/lib64/systemd/system/sockets.target.wants/docker.socket</Path>
             <Path fileType="library">/usr/lib64/sysusers.d/docker.conf</Path>
             <Path fileType="data">/usr/share/bash-completion/completions/docker</Path>
+            <Path fileType="man">/usr/share/man/man1/docker-build.1</Path>
+            <Path fileType="man">/usr/share/man/man1/docker-run.1</Path>
+            <Path fileType="man">/usr/share/man/man1/docker.1</Path>
+            <Path fileType="man">/usr/share/man/man5/Dockerfile.5</Path>
+            <Path fileType="man">/usr/share/man/man5/docker-config-json.5</Path>
+            <Path fileType="man">/usr/share/man/man8/dockerd.8</Path>
             <Path fileType="data">/usr/share/zsh/site-functions/_docker</Path>
         </Files>
     </Package>
     <History>
-        <Update release="15">
-            <Date>2018-07-27</Date>
-            <Version>18.06.0</Version>
+        <Update release="16">
+            <Date>2018-08-25</Date>
+            <Version>18.06.1</Version>
             <Comment>Packaging update</Comment>
-            <Name>Sönke Behrendt</Name>
-            <Email>thesoenke@outlook.com</Email>
+            <Name>Philipp Trulson</Name>
+            <Email>philipp@trulson.de</Email>
         </Update>
     </History>
 </PISI>
\ No newline at end of file