diff --git a/docker.changes b/docker.changes
index a8a2781..fd46a16 100644
--- a/docker.changes
+++ b/docker.changes
@@ -1,8 +1,10 @@
 -------------------------------------------------------------------
 Thu Nov 29 09:41:11 UTC 2018 - Aleksa Sarai <asarai@suse.com>
 
+- Update docker.service to match upstream and avoid rlimit problems.
+  bsc#1112980
 - Upgrade to Docker 18.09.0-ce. See upstream changelog in the packaged
-  /usr/share/doc/packages/docker/CHANGELOG.md
+  /usr/share/doc/packages/docker/CHANGELOG.md. boo#1115464
 - Add revert of an upstream patch to fix docker-* handling.
   + packaging-0001-revert-Remove-docker-prefix-for-containerd-and-runc-.patch
 - Rebase patches:
diff --git a/docker.service b/docker.service
index 18510af..163ad74 100644
--- a/docker.service
+++ b/docker.service
@@ -15,7 +15,7 @@ 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
+LimitNOFILE=1048576
 LimitNPROC=infinity
 LimitCORE=infinity
 
@@ -27,9 +27,13 @@ TasksMax=infinity
 # Only systemd 218 and above support this property.
 Delegate=yes
 
-# This is not necessary because of how we set up containerd.
-#KillMode=process
+# Kill only the docker process, not all processes in the cgroup.
+KillMode=process
+
+# Restart the docker process if it exits prematurely.
+Restart=on-failure
+StartLimitBurst=3
+StartLimitInterval=60s
 
 [Install]
 WantedBy=multi-user.target
-