diff --git a/.gitignore b/.gitignore
index 5af1882..50e24db 100644
--- a/.gitignore
+++ b/.gitignore
@@ -61,3 +61,4 @@
 /runc-ee10b44.tar.gz
 /docker-49151a1.tar.gz
 /runc-f509e50.tar.gz
+/docker-f1040da.tar.gz
diff --git a/docker-containerd.service b/docker-containerd.service
index a7407d5..df9a3f2 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 unix:///run/containerd.sock --runtime /usr/libexec/docker/docker-runc --runtime-args --systemd-cgroup=true --shim /usr/libexec/docker/docker-containerd-shim
+ExecStart=/usr/libexec/docker/docker-containerd --listen unix:///run/containerd.sock --shim /usr/libexec/docker/docker-containerd-shim
 TasksMax=8192
 LimitNOFILE=1048576
 LimitNPROC=1048576
diff --git a/docker.service b/docker.service
index 4d4727e..24a53f8 100644
--- a/docker.service
+++ b/docker.service
@@ -13,8 +13,8 @@ EnvironmentFile=-/etc/sysconfig/docker-network
 Environment=GOTRACEBACK=crash
 Environment=DOCKER_HTTP_HOST_COMPAT=1
 ExecStart=/usr/bin/docker daemon \
-          --add-runtime docker-runc=/usr/libexec/docker/docker-runc \
-          --default-runtime=docker-runc \
+          --add-runtime oci=/usr/libexec/docker/docker-runc \
+          --default-runtime=oci \
           --containerd /run/containerd.sock \
           --exec-opt native.cgroupdriver=systemd \
           $OPTIONS \
diff --git a/docker.spec b/docker.spec
index 8d18a14..ae46dbc 100644
--- a/docker.spec
+++ b/docker.spec
@@ -28,7 +28,7 @@
 
 # docker
 %global git0 https://github.com/projectatomic/%{repo}
-%global commit0 49151a1fd0da1c2fc5ad2b7322c7b2117caaf506
+%global commit0 f1040da127b7f1167ab351cb429ac5faa421c7cf
 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
 # docker_branch used in %%check
 %global docker_branch docker-1.12
@@ -94,7 +94,7 @@ Name: %{repo}
 Epoch: 2
 %endif
 Version: 1.12.1
-Release: 5.git%{shortcommit0}%{?dist}
+Release: 6.git%{shortcommit0}%{?dist}
 Summary: Automates deployment of containerized applications
 License: ASL 2.0
 URL: https://%{provider}.%{provider_tld}/projectatomic/%{repo}
@@ -825,6 +825,10 @@ exit 0
 %{_datadir}/rhel/secrets/rhsm
 
 %changelog
+* Mon Aug 29 2016 Antonio Murdaca <runcom@fedoraproject.org> - 2:1.12.1-6.gitf1040da
+- Fix systemd cgroup
+- Fix docker.service, docker-containerd.service
+
 * Thu Aug 25 2016 Antonio Murdaca <runcom@fedoraproject.org> - 2:1.12.1-5.git49151a1
 - bump runc commit to fix init.scope
 
diff --git a/sources b/sources
index 646ac8e..d064826 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
 f0a0c1101ad259b84fb457c8c7036723  containerd-0ac3cd1.tar.gz
-db3b0d8a7aad90c11e39d9e7adde6566  docker-49151a1.tar.gz
+58705f6b074d23c71d63d29114ed15b9  docker-f1040da.tar.gz
 e237e3422b74ab7d98364cc753597377  docker-novolume-plugin-7715854.tar.gz
 9b94d69d40e7f79e713b1263e90e8efa  docker-selinux-bcd6528.tar.gz
 feefc81a3ced4cbf48218b75f2d48bf1  docker-storage-setup-194eca2.tar.gz