diff --git a/mkinitrd-boot.sh b/mkinitrd-boot.sh
index 1e0c8c4..5f9543b 100644
--- a/mkinitrd-boot.sh
+++ b/mkinitrd-boot.sh
@@ -2,7 +2,7 @@
 #%stage: block
 #%modules: nfs
 #%programs: /sbin/mount.nfs
-#%if: "$rootfstype" = "nfs" -o "$interface"
+#%if: "$rootfstype" = "nfs" -a "$interface"
 #
 ##### Network FileSystem
 ##
@@ -22,6 +22,8 @@
 
 if [ -n "$ROOTPATH" -a -z "$cmd_root" ] ; then
   case "$ROOTPATH" in
+    iscsi:*)
+	;;
     *:*)
 	rootfstype="nfs"
 	rootdev="$ROOTPATH" ;;
@@ -40,17 +42,17 @@ if [ -n "$ROOTPATH" -a -z "$cmd_root" ] ; then
   fi
 fi
 
-if [ -z "$rootdev" ]; then
-    echo "no local root= kernel option given and no root server set by the dhcp server."
-    echo "exiting to /bin/sh"
-    cd /
-    PATH=$PATH PS1='$ ' /bin/sh -i
-fi
-
 if [ "$rootfstype" = "nfs" ]; then
 	# load the nfs module before using it
 	load_modules
 	
+	if [ -z "$rootdev" ]; then
+	    echo "no local root= kernel option given and no root server set by the dhcp server."
+	    echo "exiting to /bin/sh"
+	    cd /
+	    PATH=$PATH PS1='$ ' /bin/sh -i
+	fi
+
 	rootfsmod=
 	if [ -n "$rootflags" ] ; then
 	    rootflags="${rootflags},nolock"
diff --git a/nfs-utils.changes b/nfs-utils.changes
index 3acc902..2243fc8 100644
--- a/nfs-utils.changes
+++ b/nfs-utils.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Mar 26 15:39:05 CET 2010 - mmarek@suse.cz
+
+- mkinitrd-boot.sh: Do not do anything over if iscsi should be used
+  (bnc#590135).
+
 -------------------------------------------------------------------
 Tue Mar  9 21:18:22 UTC 2010 - nfbrown@novell.com
 
diff --git a/nfs-utils.spec b/nfs-utils.spec
index a25455b..3a44948 100644
--- a/nfs-utils.spec
+++ b/nfs-utils.spec
@@ -27,7 +27,7 @@ BuildRequires:  libevent
 Url:            http://nfs.sourceforge.net
 Summary:        Support Utilities for Kernel nfsd
 Version:        1.2.1
-Release:        3
+Release:        4
 Group:          Productivity/Networking/NFS
 License:        GPLv2+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build