diff --git a/moby-engine.spec b/moby-engine.spec
index 6021f1a..5af8d02 100644
--- a/moby-engine.spec
+++ b/moby-engine.spec
@@ -18,16 +18,6 @@
 %global commit_moby 2d0083d657f82c47044c8d3948ba434b622fe2fd
 %global shortcommit_moby %(c=%{commit_moby}; echo ${c:0:7})
 
-# runc
-%global git_runc https://github.com/opencontainers/runc
-%global commit_runc 425e105d5a03fabd737a126ad93d62a9eeede87f
-%global shortcommit_runc %(c=%{commit_runc}; echo ${c:0:7})
-
-# containerd
-%global git_containerd https://github.com/containerd/containerd
-%global commit_containerd 894b81a4b802e4eb2a91d1ce216b8817763c29fb
-%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 e7933d41e7b206756115aa9df5e0599fc5169742
@@ -40,18 +30,16 @@
 
 Name: %{newname}-engine
 Version: 18.09.7
-Release: 1.ce.git%{shortcommit_moby}%{?dist}
+Release: 2.ce.git%{shortcommit_moby}%{?dist}
 Summary: The open-source application container engine
 License: ASL 2.0
 # no golang / go-md2man for ppc64
 ExcludeArch: ppc64
 Source0: %{git_moby}/archive/%{commit_moby}.tar.gz
-Source1: %{git_runc}/archive/%{commit_runc}.tar.gz
-Source2: %{git_containerd}/archive/%{commit_containerd}.tar.gz
-Source3: %{git_libnetwork}/archive/%{commit_libnetwork}.tar.gz
-Source4: %{git_tini}/archive/%{commit_tini}.tar.gz
-Source5: %{service_name}.service
-Source6: %{service_name}.sysconfig
+Source1: %{git_libnetwork}/archive/%{commit_libnetwork}.tar.gz
+Source2: %{git_tini}/archive/%{commit_tini}.tar.gz
+Source3: %{service_name}.service
+Source4: %{service_name}.sysconfig
 URL: https://www.%{origname}.com
 
 BuildRequires: btrfs-progs-devel
@@ -79,6 +67,8 @@ Requires: systemd
 Requires: tar
 Requires: xz
 Requires: pigz
+Requires: runc
+Requires: containerd
 
 # Resolves: rhbz#1165615
 Requires: device-mapper-libs >= 1.02.90-1
@@ -97,8 +87,6 @@ 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
@@ -155,46 +143,16 @@ This package installs %{summary}.
 %prep
 %autosetup -N -Sgit -n %{service_name}-ce-%{commit_moby}
 
-# untar runc
-tar zxf %{SOURCE1}
-
-# untar containerd
-tar zxf %{SOURCE2}
-
 # untar libnetwork
-tar zxf %{SOURCE3}
+tar zxf %{SOURCE1}
 
 # untar tini
-tar zxf %{SOURCE4}
+tar zxf %{SOURCE2}
 
 # correct rpmlint errors for bash completion
 sed -i '/env bash/d' components/cli/contrib/completion/bash/docker
 
-# disable stripping containerd during build
-sed -i 's/-s -w *//' containerd-%{commit_containerd}/Makefile
-
 %build
-# build runc
-(
-        cd runc-%{commit_runc}
-        mv vendor src
-        mkdir -p src/github.com/opencontainers
-        ln -fns ../../.. src/github.com/opencontainers/runc
-        export GOPATH="${PWD}"
-        make BUILDTAGS="seccomp selinux" COMMIT=%{commit_runc}
-)
-
-# build containerd
-(
-        cd containerd-%{commit_containerd}
-        version=1.2.6 #$(sed -n '/^\t*Version = /s/[^0-9.]//gp' version/version.go)
-        mv vendor src
-        mkdir -p src/github.com/containerd
-        ln -fns ../../.. src/github.com/containerd/containerd
-        export GOPATH="${PWD}"
-        make VERSION="${version}" REVISION=%{commit_containerd}
-)
-
 # build docker-proxy / libnetwork
 (
         cd libnetwork-%{commit_libnetwork}
@@ -247,20 +205,6 @@ install -p -m 755 components/engine/bundles/latest/dynbinary-daemon/%{service_na
 # install proxy
 install -p -m 755 libnetwork-%{commit_libnetwork}/%{service_name}-proxy %{buildroot}%{_bindir}/%{service_name}-proxy
 
-# install containerd
-install -p -m 755 containerd-%{commit_containerd}/bin/containerd %{buildroot}%{_bindir}/%{service_name}-containerd
-install -p -m 755 containerd-%{commit_containerd}/bin/containerd-shim %{buildroot}%{_bindir}/%{service_name}-containerd-shim
-install -p -m 755 containerd-%{commit_containerd}/bin/ctr %{buildroot}%{_bindir}/%{service_name}-containerd-ctr
-
-# 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
 
@@ -270,12 +214,12 @@ install -p -m 644 components/engine/contrib/udev/80-%{service_name}.rules %{buil
 
 # add init scripts
 install -dp %{buildroot}%{_unitdir}
-install -p -m 644 %{SOURCE5} %{buildroot}%{_unitdir}
+install -p -m 644 %{SOURCE3} %{buildroot}%{_unitdir}
 install -p -m 644 components/engine/contrib/init/systemd/docker.socket %{buildroot}%{_unitdir}
 
 # for additional args
 install -dp %{buildroot}%{_sysconfdir}/sysconfig
-install -p -m 644 %{SOURCE6} %{buildroot}%{_sysconfdir}/sysconfig/%{service_name}
+install -p -m 644 %{SOURCE4} %{buildroot}%{_sysconfdir}/sysconfig/%{service_name}
 
 # add bash, zsh, and fish completions
 install -dp %{buildroot}%{_datadir}/bash-completion/completions
@@ -327,16 +271,8 @@ getent group %{service_name} >/dev/null || groupadd -r %{service_name} || :
 %{_bindir}/%{service_name}
 %{_bindir}/%{service_name}d
 %dir %{_libexecdir}/%{service_name}/
-%{_bindir}/%{service_name}-containerd
-%{_bindir}/%{service_name}-containerd-shim
-%{_bindir}/%{service_name}-containerd-ctr
 %{_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
@@ -364,6 +300,9 @@ getent group %{service_name} >/dev/null || groupadd -r %{service_name} || :
 %{_datadir}/nano/Dockerfile.nanorc
 
 %changelog
+* Fri Jul 12 2019 Olivier Lemasle <o.lemasle@gmail.com> - 18.09.7-2.ce.git2d0083d
+- Depend on packaged versions "runc" and "containerd" instead of building them.
+
 * Thu Jun 27 2019 David Michael <dm0@redhat.com> - 18.09.7-1.ce.git2d0083d
 - Update docker-ce to commit 2d0083d (version 18.09.7).
 - Update runc to commit 425e105.
diff --git a/sources b/sources
index 506d400..3da0662 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,3 @@
 SHA512 (2d0083d657f82c47044c8d3948ba434b622fe2fd.tar.gz) = 4403f06f387663603876dc5bb38d32cf5aa554e3642aa4c164c0071390d1957f843a39f87459edb1ba5ec31e664207c83b56caef9b60172fcfefbfca052f7454
-SHA512 (425e105d5a03fabd737a126ad93d62a9eeede87f.tar.gz) = f213b6a7fa96597d2ba1068f77752bccc0a1d62e0aac02ec8d2a2552dc3c1140fd4e52b2daeb0ac8fc09c48abe4521834450baae01ad4165308813eee7654a2b
-SHA512 (894b81a4b802e4eb2a91d1ce216b8817763c29fb.tar.gz) = fa3a2652b71425a17a82f66e9a9941e5a44bffc0a223a2357630d7d72b08638fc20aa77c46400cdcb48d512a49861af802234f27966f673d9df94f7f82721cb0
 SHA512 (e7933d41e7b206756115aa9df5e0599fc5169742.tar.gz) = 0a833510df0029999bfc05c23445a58a8b2ff165c0fb2fd5c411498d1e89b5b1990d2778b32346dd2b6d61c166ff707c6277a5d1937db6345c77d3825eb59875
 SHA512 (fec3683b971d9c3ef73f284f176672c44b448662.tar.gz) = ee46d21467f8bacb4e8be72f5dfcbb23c1964286e90b4b3d3bf67dbbf79a337968ac8a0042a8191e329a65398b20ea160aae3ae5ef20ee03ebae11c2083d7621