diff --git a/mdadm.changes b/mdadm.changes
index 4957460..36af9cd 100644
--- a/mdadm.changes
+++ b/mdadm.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Tue Mar  1 22:15:23 UTC 2011 - nfbrown@novell.com
+
+- mkinitrd-boot.sh: don't assume /dev/md when device
+  name cannot be found.  It could easily be wrong,
+  and there is no need as mdadm will choose a device.
+  (bnc#656536)
+
 -------------------------------------------------------------------
 Thu Feb 17 00:27:02 UTC 2011 - nfbrown@novell.com
 
diff --git a/mkinitrd-boot.sh b/mkinitrd-boot.sh
index 01fddbd..acd141a 100644
--- a/mkinitrd-boot.sh
+++ b/mkinitrd-boot.sh
@@ -121,10 +121,11 @@ md_assemble()
 	else
 		dev=$(get_md_name "$uuid")
 		if test -z "$dev"; then
-			# fallback
-			dev=/dev/md0
+			# mdadm will pick a device name
+			$mdadm -A $mdconf --uuid=$uuid
+		else
+			$mdadm -A $mdconf --uuid=$uuid "$dev"
 		fi
-		$mdadm -A $mdconf --uuid=$uuid "$dev"
 	fi
 }