diff --git a/64-md-raid.rules b/64-md-raid.rules
index a2fe2d0..ce803de 100644
--- a/64-md-raid.rules
+++ b/64-md-raid.rules
@@ -8,6 +8,8 @@ ENV{ID_FS_TYPE}=="linux_raid_member", PROGRAM="/bin/grep -qs '^AUTO -all' /etc/m
 # import data from a raid set
 KERNEL!="md*", GOTO="md_end"
 
+#this extra caution avoids some races with the device disappearing
+TEST!="md/array_state", GOTO="md_end"
 # container devices have a metadata version of e.g. 'external:ddf' and
 # never leave state 'inactive'
 ATTR{md/metadata_version}=="external:[A-Za-z]*", ATTR{md/array_state}=="inactive", GOTO="md_ignore_state"
diff --git a/mdadm.changes b/mdadm.changes
index 55c6e57..4957460 100644
--- a/mdadm.changes
+++ b/mdadm.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Thu Feb 17 00:27:02 UTC 2011 - nfbrown@novell.com
+
+- 64-md-raid.rules: avoid races with md devices 
+  appearing and disappearing.
+  If the 'array_state' file doesn't exist, that is equivalent
+  to it having 'clear' in it. (bnc#641382)
+
 -------------------------------------------------------------------
 Wed Nov 17 03:27:33 UTC 2010 - nfbrown@novell.com