diff --git a/package.yml b/package.yml
--- a/package.yml
+++ b/package.yml
@@ -1,9 +1,9 @@
 name       : docker
-version    : 17.11.0
-release    : 12
+version    : 18.05.0
+release    : 13
 source     :
-    - git|https://github.com/docker/docker-ce.git : v17.11.0-ce
-    - git|https://github.com/docker/libnetwork.git : 7b2b1feb1de4817d522cc372af149ff48d25028e
+    - https://github.com/docker/docker-ce/archive/v18.05.0-ce.tar.gz : cc29408b382774b9f5967ee33851e97bcb7463aa7358d60004f28b836a70ba75
+    - git|https://github.com/docker/libnetwork.git : 1b91bc94094ecfdae41daa465cc0c8df37dfb3dd
 license    : Apache-2.0
 component  : virt
 summary    : Open source application container engine
@@ -34,20 +34,18 @@
     rm -v src/github.com/docker/libnetwork
 
     # Build daemon
+    export VERSION=${version}-ce
     pushd components/engine
-    export DOCKER_GITCOMMIT="7cbbc92838236e442de83d7ae6b3d74dd981b586"
+    export DOCKER_GITCOMMIT="f150324782643a5268a04e7d1a675587125da20e"
     export AUTO_GOPATH=1
     ./hack/make.sh dynbinary
     popd
 
     # Build CLI
-    export VERSION=$version-ce
     ln -sv `pwd`/components/cli src/github.com/docker
     pushd components/cli
     ./scripts/build/dynbinary
 install    : |
-    export CE=${version}-ce
-
     # Required directories
     install -D -d -m 00755 $installdir/usr/bin
     install -D -d -m 00755 $installdir/%libdir%/systemd/system
@@ -59,7 +57,7 @@
 
     # Main docker daemon
     pushd components/engine
-    install -m 00755 bundles/dynbinary-daemon/dockerd-${CE} $installdir/usr/bin/dockerd
+    install -m 00755 bundles/dynbinary-daemon/dockerd-${version}-ce $installdir/usr/bin/dockerd
     popd
 
     # Now install proxy service
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>Mateusz Mikuła</Name>
-            <Email>mati865@gmail.com</Email>
+            <Name>Sönke Behrendt</Name>
+            <Email>thesoenke@outlook.com</Email>
         </Packager>
         <License>Apache-2.0</License>
         <PartOf>virt</PartOf>
@@ -23,7 +23,13 @@
 </Description>
         <PartOf>virt</PartOf>
         <Files>
-            <Path fileType="executable">/usr/bin</Path>
+            <Path fileType="executable">/usr/bin/docker</Path>
+            <Path fileType="executable">/usr/bin/docker-containerd</Path>
+            <Path fileType="executable">/usr/bin/docker-containerd-ctr</Path>
+            <Path fileType="executable">/usr/bin/docker-containerd-shim</Path>
+            <Path fileType="executable">/usr/bin/docker-proxy</Path>
+            <Path fileType="executable">/usr/bin/docker-runc</Path>
+            <Path fileType="executable">/usr/bin/dockerd</Path>
             <Path fileType="library">/usr/lib64/systemd/system/docker.service</Path>
             <Path fileType="library">/usr/lib64/systemd/system/docker.socket</Path>
             <Path fileType="library">/usr/lib64/systemd/system/sockets.target.wants/docker.socket</Path>
@@ -31,12 +37,12 @@
         </Files>
     </Package>
     <History>
-        <Update release="12">
-            <Date>2018-02-20</Date>
-            <Version>17.11.0</Version>
+        <Update release="13">
+            <Date>2018-07-04</Date>
+            <Version>18.05.0</Version>
             <Comment>Packaging update</Comment>
-            <Name>Mateusz Mikuła</Name>
-            <Email>mati865@gmail.com</Email>
+            <Name>Sönke Behrendt</Name>
+            <Email>thesoenke@outlook.com</Email>
         </Update>
     </History>
 </PISI>
\ No newline at end of file