diff --git a/cryptsetup.changes b/cryptsetup.changes
index 1605208..e6bc4ca 100644
--- a/cryptsetup.changes
+++ b/cryptsetup.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sun Dec 14 12:27:34 CET 2008 - bwalle@suse.de
+
+- Fix LUKS root partition residing on a soft raid (bnc #358341)
+
 -------------------------------------------------------------------
 Mon Nov  3 14:03:33 CET 2008 - mkoenig@suse.de
 
diff --git a/cryptsetup.spec b/cryptsetup.spec
index bedaa24..e4883cc 100644
--- a/cryptsetup.spec
+++ b/cryptsetup.spec
@@ -30,7 +30,7 @@ License:        BSD 3-Clause; GPL v2 only; GPL v2 or later
 Group:          System/Base
 AutoReqProv:    on
 Version:        1.0.5_SVNr46
-Release:        57
+Release:        58
 Summary:        Set Up dm-crypt Based Encrypted Block Devices
 Source:         cryptsetup-%{version}.tar.bz2
 Source1:        hashalot-%haver.tar.bz2
@@ -225,6 +225,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libcryptsetup.so
 
 %changelog
+* Sun Dec 14 2008 bwalle@suse.de
+- Fix LUKS root partition residing on a soft raid (bnc #358341)
 * Mon Nov 03 2008 mkoenig@suse.de
 - boot.crypto-early: explicitly start before boot.localfs
 * Fri Sep 12 2008 mkoenig@suse.de
diff --git a/mkinitrd-boot.sh b/mkinitrd-boot.sh
index d2e063e..b48e98f 100644
--- a/mkinitrd-boot.sh
+++ b/mkinitrd-boot.sh
@@ -26,5 +26,7 @@ case $luks_lang in
 esac
 
 for curluks in $luks; do
-	/sbin/cryptsetup luksOpen $(eval echo \$luks_${curluks}) $curluks
+        DEVICE=$(eval echo \$luks_${curluks})
+        check_for_device $DEVICE
+        /sbin/cryptsetup luksOpen $DEVICE $curluks
 done