diff --git a/bind.changes b/bind.changes
index cd6ae52..c1e4431 100644
--- a/bind.changes
+++ b/bind.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Sep  8 14:00:01 UTC 2014 - werner@suse.de
+
+- Use the systemd service macros to make sure init scripts are
+  registered properly (bnc#894627)
+
 -------------------------------------------------------------------
 Wed Sep  3 11:38:47 UTC 2014 - max@suse.com
 
diff --git a/bind.spec b/bind.spec
index 463ace4..9f8b526 100644
--- a/bind.spec
+++ b/bind.spec
@@ -409,9 +409,11 @@ test -d ${TEMP_DIR} || \
 test -e ${TEMP_SYSCONFIG_FILE} && \
 	old ${TEMP_SYSCONFIG_FILE}
 echo "NAMED_RUN_CHROOTED=\"${NAMED_RUN_CHROOTED}\"" >${TEMP_SYSCONFIG_FILE}
+%service_add_pre named
 
 %preun
 %stop_on_removal named
+%service_del_preun named
 
 %post
 %{fillup_and_insserv -nf named}
@@ -528,10 +530,12 @@ if [ -f ${NAMED_ACTIVE_FILE} ]; then
 	sbin/insserv named
 	test ! -s ${NAMED_ACTIVE_FILE} && rm -f ${NAMED_ACTIVE_FILE}
 fi
+%service_add_post named
 
 %postun
 %restart_on_update named
 %insserv_cleanup
+%service_del_postun named
 
 %pre chrootenv
 %{GROUPADD_NAMED}
@@ -544,6 +548,7 @@ fi
 %pre lwresd
 %{GROUPADD_NAMED}
 %{USERADD_NAMED}
+%service_add_pre lwresd
 
 %post lwresd
 # Create a key if usr/sbin/rndc-confgen is installed.
@@ -559,13 +564,16 @@ fi
 if [ $1 -le 1 ]; then
     %{fillup_and_insserv -fy lwresd}
 fi;
+%service_add_post lwresd
 
 %preun lwresd
 %stop_on_removal lwresd
+%service_add_preun lwresd
 
 %postun lwresd
 %restart_on_update lwresd
 %insserv_cleanup
+%service_add_postun lwresd
 
 %post utils
 /sbin/ldconfig