diff --git a/docker.changes b/docker.changes
index 2f30426..ee6b399 100644
--- a/docker.changes
+++ b/docker.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Jul  5 14:26:45 UTC 2016 - asarai@suse.com
+
+* Update docker.service to include changes from upstream, including the
+  soon-to-be-merged patch https://github.com/docker/docker/pull/24307,
+  which fixes bnc#983015.
+
 -------------------------------------------------------------------
 Fri Jun 24 00:23:57 UTC 2016 - dmueller@suse.com
 
diff --git a/docker.service b/docker.service
index ba34b05..5ea1fc0 100644
--- a/docker.service
+++ b/docker.service
@@ -7,10 +7,19 @@ Requires=docker.socket containerd.socket
 [Service]
 EnvironmentFile=/etc/sysconfig/docker
 ExecStart=/usr/bin/docker daemon -H fd:// --containerd /run/containerd/containerd.sock $DOCKER_NETWORK_OPTIONS $DOCKER_OPTS
-LimitNOFILE=1048576
-LimitNPROC=1048576
+ExecReload=/bin/kill -s HUP $MAINPID
+# Having non-zero Limit*s causes performance problems due to accounting overhead
+# in the kernel. We recommend using cgroups to do container-local accounting.
+LimitNOFILE=infinity
+LimitNPROC=infinity
 LimitCORE=infinity
+# Uncomment TasksMax if your systemd version supports it.
+# Only systemd 226 and above support this version.
+#TasksMax=infinity
+# Set delegate yes so that systemd does not reset the cgroups of docker containers
+Delegate=yes
+# Kill only the docker process, not all processes in the cgroup
+KillMode=process
 
 [Install]
 WantedBy=multi-user.target
-