diff --git a/open-iscsi.changes b/open-iscsi.changes
index 5fecfc6..da124db 100644
--- a/open-iscsi.changes
+++ b/open-iscsi.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Oct 27 09:25:02 UTC 2011 - aj@suse.de
+
+- Rename init scripts (bnc#661401).
+
 -------------------------------------------------------------------
 Mon Jun  6 09:20:29 UTC 2011 - aj@suse.de
 
diff --git a/open-iscsi.spec b/open-iscsi.spec
index 01389c4..59f4d9b 100644
--- a/open-iscsi.spec
+++ b/open-iscsi.spec
@@ -130,7 +130,9 @@ Authors:
 make DESTDIR=${RPM_BUILD_ROOT} install
 make DESTDIR=${RPM_BUILD_ROOT} install_initd_suse
 install -D -m 755 %{S:11} ${RPM_BUILD_ROOT}/sbin/iscsi-gen-initiatorname
-(cd ${RPM_BUILD_ROOT}/sbin; ln -sf /etc/init.d/open-iscsi rcopen-iscsi)
+mv ${RPM_BUILD_ROOT}/etc/init.d/boot.open-iscsi ${RPM_BUILD_ROOT}/etc/init.d/boot.iscsid-early
+mv ${RPM_BUILD_ROOT}/etc/init.d/open-iscsi ${RPM_BUILD_ROOT}/etc/init.d/iscsid
+(cd ${RPM_BUILD_ROOT}/sbin; ln -sf /etc/init.d/iscsid rciscsid)
 (cd ${RPM_BUILD_ROOT}/etc; ln -sf iscsi/iscsid.conf iscsid.conf)
 
 %clean
@@ -138,7 +140,7 @@ install -D -m 755 %{S:11} ${RPM_BUILD_ROOT}/sbin/iscsi-gen-initiatorname
 
 %post
 [ -x /sbin/mkinitrd_setup ] && mkinitrd_setup
-%{fillup_and_insserv -y boot.open-iscsi}
+%{fillup_and_insserv -y boot.iscsid-early}
 if [ ! -f /etc/iscsi/initiatorname.iscsi ] ; then
     /sbin/iscsi-gen-initiatorname
 fi
@@ -148,7 +150,7 @@ fi
 %{insserv_cleanup}
 
 %preun
-%{stop_on_removal open-iscsi}
+%{stop_on_removal iscsid}
 
 %files
 %defattr(-,root,root)
@@ -157,8 +159,8 @@ fi
 %dir /etc/iscsi/ifaces
 %config /etc/iscsi/ifaces/iface.example
 /etc/iscsid.conf
-%config /etc/init.d/open-iscsi
-%config /etc/init.d/boot.open-iscsi
+%config /etc/init.d/iscsid
+%config /etc/init.d/boot.iscsid-early
 /sbin/*
 %dir /lib/mkinitrd
 %dir /lib/mkinitrd/scripts