diff --git a/open-iscsi-add-mkinitrd-scriptlets b/open-iscsi-add-mkinitrd-scriptlets
index b1fe452..f8ce0f9 100644
--- a/open-iscsi-add-mkinitrd-scriptlets
+++ b/open-iscsi-add-mkinitrd-scriptlets
@@ -1,6 +1,9 @@
-diff --git a/etc/mkinitrd/mkinitrd-boot.sh b/etc/mkinitrd/mkinitrd-boot.sh
-new file mode 100644
-index 0000000..9bd22ff
+---
+ etc/mkinitrd/mkinitrd-boot.sh  |   95 +++++++++++++++++++++++++++++++++++++++++
+ etc/mkinitrd/mkinitrd-setup.sh |   70 ++++++++++++++++++++++++++++++
+ etc/mkinitrd/mkinitrd-stop.sh  |   21 +++++++++
+ 3 files changed, 186 insertions(+)
+
 --- /dev/null
 +++ b/etc/mkinitrd/mkinitrd-boot.sh
 @@ -0,0 +1,95 @@
@@ -8,7 +11,7 @@ index 0000000..9bd22ff
 +#%stage: device
 +#%depends: network
 +#%programs: /sbin/iscsid /sbin/iscsiadm
-+#%modules: iscsi_tcp crc32c scsi_transport_iscsi iscsi_ibft
++#%modules: iscsi_tcp crc32c scsi_transport_iscsi
 +#%if: "$root_iscsi" -o "$TargetAddress"
 +#
 +##### iSCSI initialization
@@ -99,9 +102,6 @@ index 0000000..9bd22ff
 +
 +# Activate all 'onboot' sessions
 +/sbin/iscsiadm -m node -L onboot
-diff --git a/etc/mkinitrd/mkinitrd-setup.sh b/etc/mkinitrd/mkinitrd-setup.sh
-new file mode 100644
-index 0000000..51a22d3
 --- /dev/null
 +++ b/etc/mkinitrd/mkinitrd-setup.sh
 @@ -0,0 +1,70 @@
@@ -175,9 +175,6 @@ index 0000000..51a22d3
 +
 +save_var TargetPort 3260 # in case the port was not defined via command line we assign a default port
 +
-diff --git a/etc/mkinitrd/mkinitrd-stop.sh b/etc/mkinitrd/mkinitrd-stop.sh
-new file mode 100644
-index 0000000..c87073f
 --- /dev/null
 +++ b/etc/mkinitrd/mkinitrd-stop.sh
 @@ -0,0 +1,21 @@
diff --git a/open-iscsi.changes b/open-iscsi.changes
index f96f7e9..be693c1 100644
--- a/open-iscsi.changes
+++ b/open-iscsi.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Mar 12 18:05:27 CET 2010 - mmarek@suse.cz
+
+- Do not hardcode the iscsi_ibft module in the iscsi mkinitrd
+  script, the ibft script handles this correctly (bnc#528657).
+
 -------------------------------------------------------------------
 Tue Nov  3 19:09:35 UTC 2009 - coolo@novell.com
 
diff --git a/open-iscsi.spec b/open-iscsi.spec
index 60b9431..9839c68 100644
--- a/open-iscsi.spec
+++ b/open-iscsi.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package open-iscsi (Version 2.0.870)
 #
-# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -21,12 +21,12 @@
 Name:           open-iscsi
 BuildRequires:  bison db-devel flex
 Url:            http://www.open-iscsi.org
-License:        GPL v2 or later
+License:        GPLv2+
 Group:          Productivity/Networking/Other
 PreReq:         %fillup_prereq %insserv_prereq
 AutoReqProv:    on
 Version:        2.0.870
-Release:        28
+Release:        35
 Provides:       linux-iscsi
 Obsoletes:      linux-iscsi
 %define iscsi_release 865