diff --git a/modules.d/90mdraid/install b/modules.d/90mdraid/install
index 9b699411..bb654690 100755
--- a/modules.d/90mdraid/install
+++ b/modules.d/90mdraid/install
@@ -1,5 +1,10 @@
 #!/bin/bash
 dracut_install mdadm
+# XXX: mdmon really needs to run as non-root?
+#      If so, write only the user it needs in the initrd's /etc/passwd (and maybe /etc/group)
+#      in a similar fashion to modules.d/95nfs.  Do not copy /etc/passwd and /etc/group from 
+#      the system into the initrd.
+#      dledford has hardware to test this, so he should be able to clean this up.
 inst /etc/passwd
 inst /etc/group
 instmods =drivers/md
diff --git a/modules.d/95nfs/install b/modules.d/95nfs/install
index 5cf0ff66..d0d0edba 100755
--- a/modules.d/95nfs/install
+++ b/modules.d/95nfs/install
@@ -4,7 +4,7 @@ which rpcbind >/dev/null 2>&1 && dracut_install rpcbind
 
 dracut_install rpc.statd mount.nfs mount.nfs4 umount 
 [ -f /etc/netconfig ] && dracut_install /etc/netconfig 
-dracut_install /etc/passwd /etc/services 
+dracut_install /etc/services 
 dracut_install /etc/nsswitch.conf /etc/rpc /etc/protocols
 dracut_install rpc.idmapd /etc/idmapd.conf
 if ldd $(which rpc.idmapd) |grep -q lib64; then
@@ -26,7 +26,7 @@ mkdir -p "$initdir/var/lib/nfs/statd/sm"
 
 # Rather than copy the passwd file in, just set a user for rpcbind
 # We'll save the state and restart the daemon from the root anyway
-#echo "rpc:x:32:32:Rpcbind:/var/lib/rpcbind:/bin/false" >> "$initdir/etc/passwd"
+echo "rpc:x:32:32:Rpcbind:/var/lib/rpcbind:/bin/false" >> "$initdir/etc/passwd"
 
 # rpc user needs to be able to write to this directory to save the warmstart
 # file