diff --git a/src/locking/virtlockd.service.in b/src/locking/virtlockd.service.in
index 0ef9923233..a1298a3451 100644
--- a/src/locking/virtlockd.service.in
+++ b/src/locking/virtlockd.service.in
@@ -4,9 +4,12 @@ Requires=virtlockd.socket
 
 [Service]
 EnvironmentFile=-/etc/sysconfig/virtlockd
-ExecStart=@sbindir@/virtlockd
-ExecReload=/bin/kill -HUP $MAINPID
+ExecStart=@sbindir@/virtlockd $VIRTLOCKD_ARGS
+ExecReload=/bin/kill -USR1 $MAINPID
 # Loosing the locks is a really bad thing that will
 # cause the machine to be fenced (rebooted), so make
 # sure we discourage OOM killer
 OOMScoreAdjust=-900
+
+[Install]
+Also=virtlockd.socket
diff --git a/src/locking/virtlockd.socket.in b/src/locking/virtlockd.socket.in
index a38b1f4d94..9808bbb1be 100644
--- a/src/locking/virtlockd.socket.in
+++ b/src/locking/virtlockd.socket.in
@@ -5,4 +5,4 @@ Description=Virtual machine lock manager socket
 ListenStream=@localstatedir@/run/libvirt/virtlockd-sock
 
 [Install]
-WantedBy=multi-user.target
+WantedBy=sockets.target