diff --git a/mdadm.changes b/mdadm.changes
index 876d5cf..5be4359 100644
--- a/mdadm.changes
+++ b/mdadm.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Nov  3 00:23:45 UTC 2014 - nfbrown@suse.com
+
+- mdcheck-no-devices.fix
+  mdcheck mustn't report an error if not md devices
+  exist (bnc#903051)
+
 -------------------------------------------------------------------
 Mon Sep 29 01:23:13 UTC 2014 - nfbrown@suse.com
 
diff --git a/mdadm.spec b/mdadm.spec
index 5a4fb28..ffc5562 100644
--- a/mdadm.spec
+++ b/mdadm.spec
@@ -42,6 +42,8 @@ Source7:        mdadm.cron
 Patch1:         0001-Makefile-install-mdadm-grow-continue-.service.patch
 # PATCH-FIX-UPSTREAM 0001-Grow-fix-removal-of-line-in-wrong-case.patch bnc#881530 nfbrown@suse.de
 Patch2:         0001-Grow-fix-removal-of-line-in-wrong-case.patch
+# PATCH-FIX-UPSTREAM mdcheck-no-devices.fix bnc#903051 nfbrown@suse.de
+Patch3:         mdcheck-no-devices.fix
 
 %define _udevdir %(pkg-config --variable=udevdir udev)
 %define _systemdshutdowndir %{_unitdir}/../system-shutdown
@@ -55,6 +57,7 @@ programs but with a very different interface.
 %setup -q -a1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 make %{?_smp_mflags} CC="%__cc" CXFLAGS="$RPM_OPT_FLAGS -Wno-error" SUSE=yes
diff --git a/mdcheck-no-devices.fix b/mdcheck-no-devices.fix
new file mode 100644
index 0000000..a2939c1
--- /dev/null
+++ b/mdcheck-no-devices.fix
@@ -0,0 +1,14 @@
+---
+ misc/mdcheck |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- mdadm-3.3.1.orig/misc/mdcheck
++++ mdadm-3.3.1/misc/mdcheck
+@@ -77,6 +77,7 @@ find /var/lib/mdcheck -name "MD_UUID*" -
+ cnt=0
+ for dev in /dev/md?*
+ do
++	[ -e "$dev" ] || continue
+ 	sys=`sysname $dev`
+ 	if [ ! -f "$sys/md/sync_action" ]
+ 	then # cannot check this array