diff --git a/contrib/init/systemd/MAINTAINERS b/contrib/init/systemd/MAINTAINERS
new file mode 100644
index 0000000000..0c6b0e9d70
--- /dev/null
+++ b/contrib/init/systemd/MAINTAINERS
@@ -0,0 +1 @@
+Lokesh Mandvekar <lsm5@fedoraproject.org> (@lsm5)
diff --git a/contrib/init/systemd/docker.service b/contrib/init/systemd/docker.service
index 6f3cc33c36..c67c795ed9 100644
--- a/contrib/init/systemd/docker.service
+++ b/contrib/init/systemd/docker.service
@@ -2,9 +2,10 @@
 Description=Docker Application Container Engine
 Documentation=http://docs.docker.com
 After=network.target
+Requires=docker.socket
 
 [Service]
-ExecStart=/usr/bin/docker -d
+ExecStart=/usr/bin/docker -d -H fd://
 Restart=on-failure
 LimitNOFILE=1048576
 LimitNPROC=1048576
diff --git a/contrib/init/systemd/socket-activation/docker.socket b/contrib/init/systemd/docker.socket
similarity index 100%
rename from contrib/init/systemd/socket-activation/docker.socket
rename to contrib/init/systemd/docker.socket
diff --git a/contrib/init/systemd/socket-activation/docker.service b/contrib/init/systemd/socket-activation/docker.service
deleted file mode 100644
index 4af71378c8..0000000000
--- a/contrib/init/systemd/socket-activation/docker.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=Docker Application Container Engine
-Documentation=http://docs.docker.com
-After=network.target
-
-[Service]
-ExecStart=/usr/bin/docker -d -H fd://
-Restart=on-failure
-LimitNOFILE=1048576
-LimitNPROC=1048576
-
-[Install]
-WantedBy=multi-user.target