diff --git a/files/0001-Default-to-using-overlayfs.patch b/files/0001-Default-to-using-overlayfs.patch
--- a/files/0001-Default-to-using-overlayfs.patch
+++ b/files/0001-Default-to-using-overlayfs.patch
@@ -5,13 +5,13 @@
 
 Signed-off-by: Ikey Doherty <ikey@solus-project.com>
 ---
- components/packaging/deb/systemd/docker.service | 2 +-
+ components/engine/contrib/init/systemd/docker.service | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/components/packaging/deb/systemd/docker.service b/components/packaging/deb/systemd/docker.service
+diff --git a/components/engine/contrib/init/systemd/docker.service b/components/engine/contrib/init/systemd/docker.service
 index 517463172b..536239ab70 100644
---- a/components/packaging/deb/systemd/docker.service
-+++ b/components/packaging/deb/systemd/docker.service
+--- a/components/engine/contrib/init/systemd/docker.service
++++ b/components/engine/contrib/init/systemd/docker.service
 @@ -10,7 +10,7 @@ Type=notify
  # the default is not to use systemd for cgroups because the delegate issues still
  # exists and systemd currently does not support the cgroup feature set required
@@ -21,6 +21,5 @@
  ExecReload=/bin/kill -s HUP $MAINPID
  LimitNOFILE=1048576
  # Having non-zero Limit*s causes performance problems due to accounting overhead
--- 
+--
 2.15.0
-
diff --git a/package.yml b/package.yml
--- a/package.yml
+++ b/package.yml
@@ -1,9 +1,10 @@
 name       : docker
-version    : 18.06.1
-release    : 16
+version    : 18.09.0
+release    : 17
 source     :
-    - https://github.com/docker/docker-ce/archive/v18.06.1-ce.tar.gz : 153cb489033686260dfe7a42acbdd1753d56f7a9c2d7ad90633f0c8cce563b23
-    - git|https://github.com/docker/libnetwork.git : a79d3687931697244b8e03485bf7b2042f8ec6b6
+    - https://github.com/docker/docker-ce/archive/v18.09.0.tar.gz : 0f251f04b1973956f070c1d7ee2751a9663da2d9d701fbab7e957f0f5f310478
+    - git|https://github.com/docker/libnetwork.git : 8bc51fd276b549b106dbc7bf8ab18b3a01d66e64
+    - git|https://github.com/krallin/tini.git : v0.18.0
 license    : Apache-2.0
 component  : virt
 summary    : Open source application container engine
@@ -37,11 +38,19 @@
     # Build daemon
     export VERSION=${version}-ce
     pushd components/engine
-    export DOCKER_GITCOMMIT="e68fc7a215d7133c34aa18e3b72b4a21fd0c6136"
+    export DOCKER_GITCOMMIT="4d60db472b2bde6931072ca6467f2667c2590dff"
     export AUTO_GOPATH=1
     ./hack/make.sh dynbinary
     popd
 
+    # Build docker-init
+    mkdir -p src/github.com/krallin/tini
+    cp -r $sources/tini.git/* src/github.com/krallin/tini/
+    pushd src/github.com/krallin/tini
+    %cmake .
+    %make tini-static
+    popd
+
     # Build CLI
     ln -sv `pwd`/components/cli src/github.com/docker
     pushd components/cli
@@ -65,12 +74,15 @@
     install -m00755 bundles/dynbinary-daemon/dockerd-${version}-ce $installdir/usr/bin/dockerd
     popd
 
+    # Now install docker-init
+    install -m00755 $workdir/src/github.com/krallin/tini/tini-static $installdir/usr/bin/docker-init
+
     # Now install proxy service
     install -m00755 $workdir/docker-proxy $installdir/usr/bin/docker-proxy
 
     # Now install systemd units
-    install -m00644 components/packaging/deb/systemd/docker.service $installdir/%libdir%/systemd/system/.
-    install -m00644 components/packaging/deb/systemd/docker.socket $installdir/%libdir%/systemd/system/.
+    install -m00644 components/engine/contrib/init/systemd/docker.service $installdir/%libdir%/systemd/system/.
+    install -m00644 components/engine/contrib/init/systemd/docker.socket $installdir/%libdir%/systemd/system/.
 
     # Enable socket activation by default
     install -Ddm00755 $installdir/%libdir%/systemd/system/sockets.target.wants
diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml
--- a/pspec_x86_64.xml
+++ b/pspec_x86_64.xml
@@ -27,6 +27,7 @@
             <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-init</Path>
             <Path fileType="executable">/usr/bin/docker-proxy</Path>
             <Path fileType="executable">/usr/bin/docker-runc</Path>
             <Path fileType="executable">/usr/bin/dockerd</Path>
@@ -45,12 +46,12 @@
         </Files>
     </Package>
     <History>
-        <Update release="16">
-            <Date>2018-08-25</Date>
-            <Version>18.06.1</Version>
+        <Update release="17">
+            <Date>2018-11-23</Date>
+            <Version>18.09.0</Version>
             <Comment>Packaging update</Comment>
             <Name>Philipp Trulson</Name>
             <Email>philipp@trulson.de</Email>
         </Update>
     </History>
 </PISI>
\ No newline at end of file