diff --git a/package.yml b/package.yml
--- a/package.yml
+++ b/package.yml
@@ -1,6 +1,6 @@
 name       : docker
 version    : 18.05.0
-release    : 13
+release    : 14
 source     :
     - https://github.com/docker/docker-ce/archive/v18.05.0-ce.tar.gz : cc29408b382774b9f5967ee33851e97bcb7463aa7358d60004f28b836a70ba75
     - git|https://github.com/docker/libnetwork.git : 1b91bc94094ecfdae41daa465cc0c8df37dfb3dd
@@ -79,3 +79,7 @@
     ln -s containerd-shim $installdir/usr/bin/docker-containerd-shim
     ln -s ctr $installdir/usr/bin/docker-containerd-ctr
     ln -s runc $installdir/usr/bin/docker-runc
+
+    # 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
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>Matt Critchlow</Name>
+            <Email>matt.critchlow@gmail.com</Email>
         </Packager>
         <License>Apache-2.0</License>
         <PartOf>virt</PartOf>
@@ -34,15 +34,17 @@
             <Path fileType="library">/usr/lib64/systemd/system/docker.socket</Path>
             <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="data">/usr/share/zsh/site-functions/_docker</Path>
         </Files>
     </Package>
     <History>
-        <Update release="13">
-            <Date>2018-07-04</Date>
+        <Update release="14">
+            <Date>2018-07-24</Date>
             <Version>18.05.0</Version>
             <Comment>Packaging update</Comment>
-            <Name>Sönke Behrendt</Name>
-            <Email>thesoenke@outlook.com</Email>
+            <Name>Matt Critchlow</Name>
+            <Email>matt.critchlow@gmail.com</Email>
         </Update>
     </History>
 </PISI>
\ No newline at end of file