diff --git a/contrib/init/systemd/docker.service b/contrib/init/systemd/docker.service
index c67c795ed9..0cb31e32c0 100644
--- a/contrib/init/systemd/docker.service
+++ b/contrib/init/systemd/docker.service
@@ -1,14 +1,13 @@
 [Unit]
 Description=Docker Application Container Engine
 Documentation=http://docs.docker.com
-After=network.target
+After=network.target docker.socket
 Requires=docker.socket
 
 [Service]
 ExecStart=/usr/bin/docker -d -H fd://
-Restart=on-failure
 LimitNOFILE=1048576
 LimitNPROC=1048576
 
 [Install]
-WantedBy=multi-user.target
+Also=docker.socket