diff --git a/debian/heartbeat-2.hb_watchdog.service b/debian/heartbeat-2.hb_watchdog.service
new file mode 100644
index 0000000..be86777
--- /dev/null
+++ b/debian/heartbeat-2.hb_watchdog.service
@@ -0,0 +1,26 @@
+[Unit]
+Description=Heartbeat Watchdog for High-Availability Linux
+Documentation=man:heartbeat(8)
+DefaultDependencies=no
+Before=graphical.target
+After=network-online.target
+After=heartbeat.service
+After=monit.service
+Requires=monit.service
+Wants=network-online.target
+
+[Service]
+Type=forking
+Restart=no
+TimeoutSec=5min
+IgnoreSIGPIPE=no
+KillMode=process
+GuessMainPID=no
+RemainAfterExit=yes
+SuccessExitStatus=5 6
+ExecStart=/etc/init.d/hb_watchdog start
+ExecStop=/etc/init.d/hb_watchdog stop
+
+[Install]
+# XXX: This is a hack.
+WantedBy=graphical.target
diff --git a/debian/heartbeat-2.heartbeat.service b/debian/heartbeat-2.heartbeat.service
new file mode 100644
index 0000000..499131b
--- /dev/null
+++ b/debian/heartbeat-2.heartbeat.service
@@ -0,0 +1,29 @@
+[Unit]
+Description=Heartbeat subsystem for High-Availability Linux
+Documentation=man:heartbeat(8)
+DefaultDependencies=no
+Requires=monit.service
+Before=graphical.target
+After=monit.service
+After=network-online.target
+After=time-sync.target
+After=openhpid.service
+Wants=network-online.target
+
+[Service]
+Type=forking
+Restart=no
+TimeoutSec=5min
+IgnoreSIGPIPE=no
+KillMode=process
+GuessMainPID=no
+RemainAfterExit=no
+PIDFile=/var/run/heartbeat.pid
+SuccessExitStatus=5 6
+ExecStart=/etc/init.d/heartbeat start
+ExecStop=/etc/init.d/heartbeat stop
+ExecReload=/etc/init.d/heartbeat reload
+
+[Install]
+# XXX: This is a hack.
+WantedBy=graphical.target
diff --git a/debian/rules b/debian/rules
index 9117c5a..214ddc8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -116,6 +116,8 @@ binary-arch: install
 	dh_installdebconf -a
 	dh_installdocs -a
 	dh_installexamples -a
+	dh_systemd_enable -a --name=heartbeat
+	dh_systemd_enable -a --name=hb_watchdog
 	dh_installinit -a -n
 	dh_installman -a
 	dh_installchangelogs -a $(CURDIR)/doc/ChangeLog