diff --git a/src/sbd.service.in b/src/sbd.service.in
index ef1bd16..401c2d6 100644
--- a/src/sbd.service.in
+++ b/src/sbd.service.in
@@ -1,25 +1,27 @@
 [Unit]
 Description=Shared-storage based fencing daemon
 Before=pacemaker.service
+Before=dlm.service
 After=systemd-modules-load.service iscsi.service
 PartOf=corosync.service
 RefuseManualStop=true
 RefuseManualStart=true
 
 [Service]
 Type=forking
 PIDFile=@localstatedir@/run/sbd.pid
 EnvironmentFile=-@CONFIGDIR@/sbd
 ExecStart=@sbindir@/sbd $SBD_OPTS -p @localstatedir@/run/sbd.pid watch
 ExecStop=@bindir@/kill -TERM $MAINPID
 
 # Could this benefit from exit codes for restart?
 # Does this need to be set to msgwait * 1.2?
 # TimeoutSec=
 # If SBD crashes, it'll very likely suicide immediately due to the
 # hardware watchdog. But one can always try.
 Restart=on-abort
 
 [Install]
 RequiredBy=corosync.service
-
+RequiredBy=pacemaker.service
+RequiredBy=dlm.service
diff --git a/src/sbd.sysconfig b/src/sbd.sysconfig
index cbc1501..75ff980 100644
--- a/src/sbd.sysconfig
+++ b/src/sbd.sysconfig
@@ -1,67 +1,70 @@
 ## Type: string
 ## Default: ""
 #
 # SBD_DEVICE specifies the devices to use for exchanging sbd messages
 # and to monitor. If specifying more than one path, use ";" as
 # separator.
 #
 #SBD_DEVICE=""
 
 ## Type: yesno
 ## Default: yes
 #
 # Whether to enable the pacemaker integration.
 #
 SBD_PACEMAKER=yes
 
 ## Type: list(always,clean)
 ## Default: always
 #
 # Specify the start mode for sbd. Setting this to "clean" will only
 # allow sbd to start if it was not previously fenced. See the -S option
 # in the man page.
 #
 SBD_STARTMODE=always
 
 ## Type: yesno
 ## Default: no
 #
 # Whether to delay after starting sbd on boot for "msgwait" seconds.
 # This may be necessary if your cluster nodes reboot so fast that the
 # other nodes are still waiting in the fence acknowledgement phase.
 # This is an occasional issue with virtual machines.
 #
+# Consider that you might have to adapt the startup-timeout accordingly
+# if the default isn't sufficient. (TimeoutStartSec for systemd)
+#
 # This option may be ignored at a later point, once pacemaker handles
 # this case better.
 #
 SBD_DELAY_START=no
 
 ## Type: string
 ## Default: /dev/watchdog
 #
 # Watchdog device to use. If set to /dev/null, no watchdog device will
 # be used.
 #
 SBD_WATCHDOG_DEV=/dev/watchdog
 
 ## Type: integer
 ## Default: 5
 #
 # How long, in seconds, the watchdog will wait before panicing the
 # node if no-one tickles it.
 #
 # This depends mostly on your storage latency; the majority of devices
 # must be successfully read within this time, or else the node will
 # self-fence.
 #
 # If your sbd device(s) reside on a multipath setup or iSCSI, this
 # should be the time required to detect a path failure.
 #
 SBD_WATCHDOG_TIMEOUT=5
 
 ## Type: string
 ## Default: ""
 #
 # Additional options for starting sbd
 #
 SBD_OPTS=
diff --git a/src/sbd_remote.service.in b/src/sbd_remote.service.in
index e05f80e..cefd511 100644
--- a/src/sbd_remote.service.in
+++ b/src/sbd_remote.service.in
@@ -1,24 +1,24 @@
 [Unit]
 Description=Shared-storage based fencing daemon on pacemaker remote node
 After=systemd-modules-load.service iscsi.service
 PartOf=pacemaker_remote.service
 RefuseManualStop=true
 RefuseManualStart=true
 
 [Service]
 Type=forking
 PIDFile=@localstatedir@/run/sbd.pid
 EnvironmentFile=-@CONFIGDIR@/sbd
 ExecStart=@sbindir@/sbd $SBD_OPTS -p @localstatedir@/run/sbd.pid watch
 ExecStop=@bindir@/kill -TERM $MAINPID
 
 # Could this benefit from exit codes for restart?
 # Does this need to be set to msgwait * 1.2?
 # TimeoutSec=
 # If SBD crashes, it'll very likely suicide immediately due to the
 # hardware watchdog. But one can always try.
 Restart=on-abort
 
 [Install]
 RequiredBy=pacemaker_remote.service
-
+RequiredBy=dlm.service