diff --git a/docker-containerd.service b/docker-containerd.service
index 7744516..49c069e 100644
--- a/docker-containerd.service
+++ b/docker-containerd.service
@@ -4,7 +4,7 @@ Documentation=https://containerd.tools/
 After=network.target
 
 [Service]
-ExecStart=/usr/libexec/docker/docker-containerd --listen /run/containerd.sock --runtime /usr/libexec/docker/docker-runc
+ExecStart=/usr/libexec/docker/docker-containerd --listen /run/containerd.sock --runtime /usr/libexec/docker/docker-runc --runtime-args --systemd-cgroup=true
 LimitNOFILE=1048576
 LimitNPROC=1048576
 LimitCORE=infinity
diff --git a/docker.spec b/docker.spec
index dcf2a26..b68876d 100644
--- a/docker.spec
+++ b/docker.spec
@@ -95,7 +95,7 @@ Name: %{repo}
 %endif
 Epoch: 2
 Version: 1.11
-Release: 4.git%{shortcommit0}%{?dist}
+Release: 5.git%{shortcommit0}%{?dist}
 Summary: Automates deployment of containerized applications
 License: ASL 2.0
 URL: https://%{provider}.%{provider_tld}/projectatomic/%{repo}
@@ -820,6 +820,9 @@ exit 0
 %{_bindir}/v1.10-migrator-local
 
 %changelog
+* Sat Apr 16 2016 Antonio Murdaca <runcom@fedoraproject.org> - 2:1.11-5.git69e6294
+- fixed containerd unit file
+
 * Fri Apr 15 2016 Antonio Murdaca <runcom@fedoraproject.org> - 2:1.11-4.git69e6294
 - fix containerd socket location