diff --git a/docker.spec b/docker.spec
index 988541b..bef1136 100644
--- a/docker.spec
+++ b/docker.spec
@@ -2,7 +2,7 @@
 %define userid  65440
 Name:          docker
 Version:       1.11.1
-Release:       1mamba
+Release:       2mamba
 Summary:       An open-source application container engine
 Group:         System/Servers
 Vendor:        openmamba
@@ -23,6 +23,8 @@ BuildRequires: libsystemd-devel
 BuildRequires: libgo-devel >= 6.1.0-2mamba
 BuildRequires: go-md2man
 %systemd_requires
+Requires:      containerd
+Requires:      runc
 BuildRoot:     %{_tmppath}/%{name}-%{version}-root
 
 %description
@@ -62,6 +64,12 @@ install -D -m644 contrib/syntax/vim/ftdetect/dockerfile.vim %{buildroot}%{_datad
 install -d -m755 %{buildroot}%{_mandir}
 cp -a man/man* %{buildroot}%{_mandir}/
 
+# symlink containerd/run (nice integration...)
+ln -s containerd %{buildroot}%{_bindir}/docker-containerd
+ln -s containerd-shim %{buildroot}%{_bindir}/docker-containerd-shim
+ln -s ctr %{buildroot}%{_bindir}/docker-containerd-ctr
+ln -s runc %{buildroot}%{_bindir}/docker-runc
+
 %clean
 [ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
 
@@ -88,9 +96,12 @@ fi
 %files
 %defattr(-,root,root)
 %{_bindir}/docker
+%{_bindir}/docker-containerd-ctr
+%{_bindir}/docker-containerd-shim
+%{_bindir}/docker-runc
+%{_bindir}/docker-containerd
 %{_unitdir}/docker.service
 %{_unitdir}/docker.socket
-#%{_libdir}/docker/dockerinit
 %{_datadir}/bash-completion/completions/docker
 %{_datadir}/fish/vendor_completions.d/docker.fish
 %{_mandir}/man1/docker*.1*
@@ -103,6 +114,9 @@ fi
 %doc AUTHORS LICENSE
 
 %changelog
+* Fri Jul 29 2016 Silvan Calarco <silvan.calarco@mambasoft.it> 1.11.1-2mamba
+- require containerd and add necessary symlinks
+
 * Sun May 15 2016 Silvan Calarco <silvan.calarco@mambasoft.it> 1.11.1-1mamba
 - update to 1.11.1