diff --git a/.cvsignore b/.cvsignore
index adebec6..429ae8d 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,2 @@
 mdadm-1.5.0.tgz
-mdmpd-0.1.tgz
+mdmpd-0.2.tgz
diff --git a/mdadm.spec b/mdadm.spec
index bd8fe77..79466e5 100644
--- a/mdadm.spec
+++ b/mdadm.spec
@@ -1,14 +1,14 @@
 Summary:     mdadm controls Linux md devices (software RAID arrays)
 Name:        mdadm
 Version:     1.5.0
-Release:     3
+Release: 7
 Source:      http://www.cse.unsw.edu.au/~neilb/source/mdadm/mdadm-%{version}.tgz
 Source1:     mdmonitor.init
-Source2:     mdmpd-0.1.tgz
+Source2:     mdmpd-0.2.tgz
 Source3:     mdmpd.init
 Patch:	     mdadm-1.4.0-build-mdmpd.patch
 Patch1:	     mdadm-1.5.0-email.patch
-Patch2:	     mdmpd-0.1-gcc-3.4.patch
+Patch2:      mdadm-1.5.0-reallyforce.patch
 URL:         http://www.cse.unsw.edu.au/~neilb/source/mdadm/
 License:     GPL
 Group:       System Environment/Base
@@ -27,7 +27,7 @@ file can be used to help with some common tasks.
 %setup -q -a 2
 %patch -p1 -b .mdmpd-make
 %patch1 -p1 -b .email
-%patch2 -p1 -b .gcc-3.4
+%patch2 -p1 -b .reallyforce
 
 %build
 make CXFLAGS="$RPM_OPT_FLAGS" SYSCONFDIR="%{_sysconfdir}"
@@ -51,14 +51,18 @@ mkdir -p -m 700 $RPM_BUILD_ROOT/var/run/mdmpd
 if [ "$1" = 0 ]; then
     service mdmonitor stop > /dev/null 2>&1 ||:
     /sbin/chkconfig --del mdmonitor
-    service mdmpd stop > /dev/null 2>&1 ||:
-    /sbin/chkconfig --del mdmpd
+    if [ -e %{_initrddir}/mdmpd ]; then
+        service mdmpd stop > /dev/null 2>&1 ||:
+        /sbin/chkconfig --del mdmpd
+    fi
 fi
 
 %postun
 if [ "$1" -ge "1" ]; then
     service mdmonitor condrestart > /dev/null 2>&1
-    service mdmpd condrestart > /dev/null 2>&1
+    if [ -e %{_initrddir}/mdmpd ]; then
+        service mdmpd condrestart > /dev/null 2>&1
+    fi
 fi
 
 %files
@@ -71,6 +75,24 @@ fi
 %attr(0700,root,root) %dir /var/run/mdmpd
 
 %changelog
+* Wed May 19 2004 Jeremy Katz <katzj@redhat.com> - 1.5.0-7
+- add patch with reallyforce mode on creation to be used by anaconda
+
+* Wed May 12 2004 Doug Ledford <dledford@redhat.com> 2.5.0-6
+- Fix a bug in the %postun scriptlet related to downgrading to a version
+  of mdadm that doesn't include the mdmpd daemon.
+
+* Fri May 07 2004 Doug Ledford <dledford@redhat.com> 1.5.0-5
+- Disable service mdmpd by default to avoid [Failed] messages on
+  current 2.6 kernels.  Possibly re-enable it by default once the
+  2.6 kernels have the md event interface.
+
+* Thu Apr 22 2004 Doug Ledford <dledford@redhat.com> 1.5.0-4
+- Update mdmonitor script to start daemon more cleanly
+- Repackage mdmpd tarball to include gcc-3.4 changes and to make
+  mdmpd properly daemonize at startup instead of forking and leaving
+  the child attached to the terminal.
+
 * Thu Mar  4 2004 Bill Nottingham <notting@redhat.com> 1.5.0-3
 - ship /var/run/mpmpd (#117497)
 
diff --git a/mdmonitor.init b/mdmonitor.init
index cbd6629..0e8b8e5 100755
--- a/mdmonitor.init
+++ b/mdmonitor.init
@@ -3,7 +3,7 @@
 # mdmonitor	This starts, stops, and reloads the mdadm-based
 #		software RAID monitoring and management facility
 #
-# chkconfig: 2345 99 99
+# chkconfig: 2345 15 85
 # description: software RAID monitoring and management
 # config: /etc/mdadm.conf
 #
@@ -35,23 +35,28 @@ start ()
 {
     ulimit -S -c 0 >/dev/null 2>&1
     echo -n $"Starting $prog: "
-    mdadm --monitor --scan &
-    echo $! > /var/run/mdadm.pid
+    daemon --check mdadm \
+	"/bin/bash -c \"mdadm --monitor --scan -f > /var/run/mdadm.pid\""
     # hack: wait for mdadm to die, assume success if it doesn't die quickly
     usleep 100000
-    if [ -d /proc/$(cat /var/run/mdadm.pid) ] ; then
+    if [ -s /var/run/mdadm.pid -a -d /proc/$(cat /var/run/mdadm.pid) ] ; then
 	success $"mdadm"
 	RETVAL=0
+        touch /var/lock/subsys/$prog
     else
 	failure $"mdadm"
+	rm -f /var/run/mdadm.pid
+        rm -f /var/lock/subsys/$prog
 	RETVAL=1
     fi
-    touch /var/lock/subsys/$prog
+    echo
 }
 
 stop ()
 {
+    echo -n "Killing $prog: "
     killproc mdadm
+    echo
     rm -f /var/run/mdadm.pid
     rm -f /var/lock/subsys/$prog
 }
diff --git a/sources b/sources
index cc5763c..937642e 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 765286c4a22e36b70ce2f817f0c4647c  mdadm-1.5.0.tgz
-9cd1fd8a232064fbd89524fffc3daee1  mdmpd-0.1.tgz
+314e31eac35fb82384da727f9040286c  mdmpd-0.2.tgz