diff --git a/lvm2.changes b/lvm2.changes
index 9008dce..5dcb503 100644
--- a/lvm2.changes
+++ b/lvm2.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Sep  2 16:59:00 CEST 2008 - hare@suse.de
+
+- Fix initrd scripts if no 'root=' parameter is given
+  (bnc#421546)
+
 -------------------------------------------------------------------
 Mon Aug 25 12:49:58 CEST 2008 - aj@suse.de
 
diff --git a/lvm2.spec b/lvm2.spec
index f195ad9..59e16dd 100644
--- a/lvm2.spec
+++ b/lvm2.spec
@@ -28,7 +28,7 @@ Obsoletes:      lvm
 PreReq:         %fillup_prereq %insserv_prereq
 AutoReqProv:    on
 Version:        2.02.38
-Release:        21
+Release:        24
 Summary:        LVM2 Tools
 Source:         LVM2.%{version}.tar.bz2
 Source1:        lvm.conf
@@ -241,6 +241,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man8/vgsplit.8.gz
 
 %changelog
+* Tue Sep 02 2008 hare@suse.de
+- Fix initrd scripts if no 'root=' parameter is given
+  (bnc#421546)
 * Mon Aug 25 2008 aj@suse.de
 - Provide and obsolete evms.
 * Mon Aug 25 2008 prusnak@suse.cz
diff --git a/mkinitrd-boot.sh b/mkinitrd-boot.sh
index 8fa1efd..cc95f74 100644
--- a/mkinitrd-boot.sh
+++ b/mkinitrd-boot.sh
@@ -56,6 +56,8 @@ load_modules
 
 if [ -n "$root_lvm2" ] ; then
     o=$(get_param root)
+    # Fallback if 'root=' is not specified
+    [ -z "$o" ] && o=$rootdev
     vg_root=$(lvm2_get_vg $o)
     if [ "$vg_root" ] ; then
         # We are waiting for a device-mapper device