diff --git a/.gitignore b/.gitignore
index b424f53..12fb923 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,5 @@
-/3ac297bc7fd0afec9051bbb47024c9bc1d75bf5b.tar.gz
-/468a545b9edcd5932818eb9de8e72413e616e86e.tar.gz
-/a592beb5bc4c4092b1b1bac971afed27687340c5.tar.gz
-/d7080c17a580919f5340a15a8e5e013133089680.tar.gz
+/2b18fe1d885ee5083ef9f0838fee39b62d653e30.tar.gz
+/4725f2163fb214a6312f3beae5991f838ec36326.tar.gz
+/bb71b10fd8f58240ca47fbb579b9d1028eea7c84.tar.gz
+/e8ff056dbcfadaeca12a5f508b0cec281126c01d.tar.gz
 /fec3683b971d9c3ef73f284f176672c44b448662.tar.gz
-/moby-engine-18.06.3-named-volumes.patch
diff --git a/moby-engine.spec b/moby-engine.spec
index 1a67ffd..ea64168 100644
--- a/moby-engine.spec
+++ b/moby-engine.spec
@@ -15,22 +15,22 @@
 
 # moby / docker-ce / cli
 %global git_moby https://github.com/%{service_name}/%{service_name}-ce
-%global commit_moby d7080c17a580919f5340a15a8e5e013133089680
+%global commit_moby e8ff056dbcfadaeca12a5f508b0cec281126c01d
 %global shortcommit_moby %(c=%{commit_moby}; echo ${c:0:7})
 
 # docker-runc
 %global git_runc https://github.com/opencontainers/runc
-%global commit_runc a592beb5bc4c4092b1b1bac971afed27687340c5
+%global commit_runc 2b18fe1d885ee5083ef9f0838fee39b62d653e30
 %global shortcommit_runc %(c=%{commit_runc}; echo ${c:0:7})
 
 # docker-containerd
 %global git_containerd https://github.com/containerd/containerd
-%global commit_containerd 468a545b9edcd5932818eb9de8e72413e616e86e
+%global commit_containerd bb71b10fd8f58240ca47fbb579b9d1028eea7c84
 %global shortcommit_containerd %(c=%{commit_containerd}; echo ${c:0:7})
 
 # docker-proxy / libnetwork
 %global git_libnetwork https://github.com/%{service_name}/libnetwork
-%global commit_libnetwork 3ac297bc7fd0afec9051bbb47024c9bc1d75bf5b
+%global commit_libnetwork 4725f2163fb214a6312f3beae5991f838ec36326
 %global shortcommit_libnetwork %(c=%{commit_libnetwork}; echo ${c:0:7})
 
 # tini
@@ -39,8 +39,8 @@
 %global shortcommit_tini %(c=%{commit_tini}; echo ${c:0:7})
 
 Name: %{newname}-engine
-Version: 18.06.3
-Release: 2.ce.git%{shortcommit_moby}%{?dist}
+Version: 18.09.5
+Release: 1.ce.git%{shortcommit_moby}%{?dist}
 Summary: The open-source application container engine
 License: ASL 2.0
 # no golang / go-md2man for ppc64
@@ -52,7 +52,6 @@ Source3: %{git_libnetwork}/archive/%{commit_libnetwork}.tar.gz
 Source4: %{git_tini}/archive/%{commit_tini}.tar.gz
 Source5: %{service_name}.service
 Source6: %{service_name}.sysconfig
-Patch1: https://github.com/moby/moby/commit/27d9030b2371aa4a6b167fded6b8dc25987a0af7.patch#/%{name}-%{version}-named-volumes.patch
 URL: https://www.%{origname}.com
 
 BuildRequires: btrfs-progs-devel
@@ -91,6 +90,8 @@ Conflicts: %{origname}-io
 Conflicts: %{origname}-engine-cs
 Conflicts: %{origname}-ce
 Conflicts: %{origname}-ee
+Conflicts: containerd
+Conflicts: runc
 
 %description
 Docker is an open source project to build, ship and run any application as a
@@ -153,8 +154,6 @@ tar zxf %{SOURCE3}
 # untar tini
 tar zxf %{SOURCE4}
 
-%patch1 -p1 -d components/engine
-
 # correct rpmlint errors for bash completion
 sed -i '/env bash/d' components/cli/contrib/completion/bash/docker
 
@@ -169,8 +168,7 @@ sed -i 's/-s -w *//' containerd-%{commit_containerd}/Makefile
         mkdir -p src/github.com/opencontainers
         ln -fns ../../.. src/github.com/opencontainers/runc
         export GOPATH="${PWD}"
-        make BUILDTAGS="seccomp selinux" COMMIT=%{commit_runc} \
-            VERSION=1.0.0-rc5+dev.docker-18.06
+        make BUILDTAGS="seccomp selinux" COMMIT=%{commit_runc}
 )
 
 # build docker-containerd
@@ -210,6 +208,7 @@ sed -i 's/-s -w *//' containerd-%{commit_containerd}/Makefile
         export DOCKER_DEBUG=1
         export DOCKER_GITCOMMIT=%{shortcommit_moby}
         export GOPATH="${PWD}/_build"
+        export VERSION=%{version}
         bash -x hack/make.sh dynbinary
 )
 
@@ -243,6 +242,12 @@ install -p -m 755 containerd-%{commit_containerd}/bin/ctr %{buildroot}%{_bindir}
 # install runc
 install -p -m 755 runc-%{commit_runc}/runc %{buildroot}%{_bindir}/%{service_name}-runc
 
+# install symlinks for Docker 18.09 program names
+ln -fns %{service_name}-containerd %{buildroot}%{_bindir}/containerd
+ln -fns %{service_name}-containerd-ctr %{buildroot}%{_bindir}/ctr
+ln -fns %{service_name}-containerd-shim %{buildroot}%{_bindir}/containerd-shim
+ln -fns %{service_name}-runc %{buildroot}%{_bindir}/runc
+
 # install tini
 install -p -m 755 tini-%{commit_tini}/tini-static %{buildroot}%{_bindir}/%{service_name}-init
 
@@ -315,6 +320,10 @@ getent group %{service_name} >/dev/null || groupadd -r %{service_name} || :
 %{_bindir}/%{service_name}-proxy
 %{_bindir}/%{service_name}-runc
 %{_bindir}/%{service_name}-init
+%{_bindir}/containerd
+%{_bindir}/containerd-shim
+%{_bindir}/ctr
+%{_bindir}/runc
 %{_usr}/lib/udev/rules.d/80-%{service_name}.rules
 %{_unitdir}/%{service_name}.service
 %{_unitdir}/%{service_name}.socket
@@ -342,6 +351,14 @@ getent group %{service_name} >/dev/null || groupadd -r %{service_name} || :
 %{_datadir}/nano/Dockerfile.nanorc
 
 %changelog
+* Thu Apr 11 2019 David Michael <dm0@redhat.com> - 18.09.5-1.ce.gite8ff056
+- Update docker-ce to commit e8ff056 (version 18.09.5).
+- Update docker-runc to commit 2b18fe1.
+- Update docker-containerd to commit bb71b10 (version 1.2.5).
+- Update docker-proxy to commit 4725f21.
+- Report the correct engine version.
+- Install symlinks to unprefixed runc/containerd program names.
+
 * Thu Mar 28 2019 David Michael <dm0@redhat.com> - 18.06.3-2.ce.gitd7080c1
 - Conflict with docker-common. (#1693397)
 
diff --git a/sources b/sources
index db87ddd..1b9e3b4 100644
--- a/sources
+++ b/sources
@@ -1,6 +1,5 @@
-SHA512 (3ac297bc7fd0afec9051bbb47024c9bc1d75bf5b.tar.gz) = 21d3d1bd8aafeab51a3e0a14ada4d559b5b113a48d315e91f7d70e4fa839f5c92d4068b38c28bf6929da9c11cfc61703bafc7148f64b784208d61fa14ee4545d
-SHA512 (468a545b9edcd5932818eb9de8e72413e616e86e.tar.gz) = 0c3cb261a535826f281af2d2df7e5c93e7d37139d5b709d7534148b9e706db56704d06b81a9e76acc2e86180f37475d566b8ddde990bbaae424af70206602347
-SHA512 (a592beb5bc4c4092b1b1bac971afed27687340c5.tar.gz) = 4b45d5f899ece2c017e93bdb211436ccea84c14ac99f3104baa5728b188536d390036f0defd40dab9514a529e48f39d093cbcc15fa98012e70c8e4f560168f9f
-SHA512 (d7080c17a580919f5340a15a8e5e013133089680.tar.gz) = 65a67f906f2a7e28d9c7e35491e5da8430d075027adf6d41b9baec21a0b3f08d006de7568e6bfa37e3b9edbbed53af71e96a553446e01abaa51533ceb4db21a2
+SHA512 (2b18fe1d885ee5083ef9f0838fee39b62d653e30.tar.gz) = e3d61506b44f05dfbad2e07d917c8408edea54c87a472ceb109e2ba2a1685b26f1407c2fe7660d416b60fc2583414af09567bcb8b3c95bc14f725d120373337c
+SHA512 (4725f2163fb214a6312f3beae5991f838ec36326.tar.gz) = 8ffd6fc97df4b63b1f83a5eb6d8e63c8c413bcf3e2ff82f507dbf875d0df6903b6fe1546d8625dd3b4681d611aed4702c423d0d5c9621ed57073cbe16bf35200
+SHA512 (bb71b10fd8f58240ca47fbb579b9d1028eea7c84.tar.gz) = a20f8e047109eef27792ffabb8c00c400fbc28c7610df480c84da26bd26cea93e4045971ec34580f4f46af403db4fbbbec404acef52162362009d219857e0e1a
+SHA512 (e8ff056dbcfadaeca12a5f508b0cec281126c01d.tar.gz) = 854ab72eae79a62c916313a9fe983f609d323c32a7444891ffc236b5c8a6045dcf86bfab592a0af717c4d6b2336907eb2cfbee810a74d62a8283652cb21ec4f9
 SHA512 (fec3683b971d9c3ef73f284f176672c44b448662.tar.gz) = ee46d21467f8bacb4e8be72f5dfcbb23c1964286e90b4b3d3bf67dbbf79a337968ac8a0042a8191e329a65398b20ea160aae3ae5ef20ee03ebae11c2083d7621
-SHA512 (moby-engine-18.06.3-named-volumes.patch) = 70a1075592e31bfa89f6b24231bdeb0d476f137a1b4aa568c281cdab1acfbcd9b738d42a31a83950479171412991ddd3d1c4bc58623df07c8ae15d606f843c9a