--- a/util.c	2013-09-03 00:47:47.000000000 -0400
+++ b/util.c	2013-10-14 10:05:27.920944673 -0400
@@ -1690,7 +1690,7 @@
 	char pathbuf[1024];
 	char *paths[4] = {
 		pathbuf,
-		"/sbin/mdmon",
+		"/usr/bin/mdmon",
 		"./mdmon",
 		NULL
 	};
--- a/udev-md-raid-assembly.rules	2013-09-03 00:47:47.000000000 -0400
+++ b/udev-md-raid-assembly.rules	2013-10-14 10:05:56.146941487 -0400
@@ -12,8 +12,8 @@
 
 # remember you can limit what gets auto/incrementally assembled by
 # mdadm.conf(5)'s 'AUTO' and selectively whitelist using 'ARRAY'
-ACTION=="add", RUN+="/sbin/mdadm --incremental $devnode --offroot"
-ACTION=="remove", ENV{ID_PATH}=="?*", RUN+="/sbin/mdadm -If $name --path $env{ID_PATH}"
-ACTION=="remove", ENV{ID_PATH}!="?*", RUN+="/sbin/mdadm -If $name"
+ACTION=="add", RUN+="/usr/bin/mdadm --incremental $devnode --offroot"
+ACTION=="remove", ENV{ID_PATH}=="?*", RUN+="/usr/bin/mdadm -If $name --path $env{ID_PATH}"
+ACTION=="remove", ENV{ID_PATH}!="?*", RUN+="/usr/bin/mdadm -If $name"
 
 LABEL="md_inc_end"
--- a/tests/testdev	2013-09-03 00:47:47.000000000 -0400
+++ b/tests/testdev	2013-10-14 10:06:16.379794678 -0400
@@ -6,8 +6,8 @@
 dsize=$[size/chunk]
 dsize=$[dsize*chunk]
 rasize=$[dsize*2*cnt]
-if [ $rasize -ne `/sbin/blockdev --getsize $dev` ]
+if [ $rasize -ne `/usr/bin/blockdev --getsize $dev` ]
 then
-  echo "ERROR: size is wrong for $dev: $cnt * $size (chunk=$chunk) = $rasize, not `/sbin/blockdev --getsize $dev`"
+  echo "ERROR: size is wrong for $dev: $cnt * $size (chunk=$chunk) = $rasize, not `/usr/bin/blockdev --getsize $dev`"
   exit 1;
 fi
--- a/test	2013-09-03 00:47:47.000000000 -0400
+++ b/test	2013-10-14 10:07:28.324754151 -0400
@@ -243,8 +243,8 @@
       rasize=$[rasize/DEV_ROUND_K/2]
       rasize=$[rasize*DEV_ROUND_K*2]
    fi
-   if [ `/sbin/blockdev --getsize $dev` -eq 0 ]; then sleep 2 ; fi
-   _sz=`/sbin/blockdev --getsize $dev`
+   if [ `/usr/bin/blockdev --getsize $dev` -eq 0 ]; then sleep 2 ; fi
+   _sz=`/usr/bin/blockdev --getsize $dev`
    if [ $rasize -lt $_sz -o $[rasize*4/5] -gt $_sz ]
    then
      echo "ERROR: size is wrong for $dev: $cnt * $dvsize (chunk=$chunk) = $rasize, not $_sz"
--- a/systemd/mdmon@.service	2013-09-03 00:47:47.000000000 -0400
+++ b/systemd/mdmon@.service	2013-10-14 10:07:56.644082207 -0400
@@ -11,7 +11,7 @@
 Before=initrd-switch-root.target
 
 [Service]
-ExecStart=/sbin/mdmon --foreground %I
+ExecStart=/usr/bin/mdmon --foreground %I
 StandardInput=null
 StandardOutput=null
 StandardError=null
--- a/policy.c	2013-09-03 00:47:47.000000000 -0400
+++ b/policy.c	2013-10-14 10:08:09.140452377 -0400
@@ -800,12 +800,12 @@
 #define UDEV_RULE_FORMAT \
 "ACTION==\"add\", SUBSYSTEM==\"block\", " \
 "ENV{DEVTYPE}==\"%s\", ENV{ID_PATH}==\"%s\", " \
-"RUN+=\"/sbin/mdadm --incremental $env{DEVNAME}\"\n"
+"RUN+=\"/usr/bin/mdadm --incremental $env{DEVNAME}\"\n"
 
 #define UDEV_RULE_FORMAT_NOTYPE \
 "ACTION==\"add\", SUBSYSTEM==\"block\", " \
 "ENV{ID_PATH}==\"%s\", " \
-"RUN+=\"/sbin/mdadm --incremental $env{DEVNAME}\"\n"
+"RUN+=\"/usr/bin/mdadm --incremental $env{DEVNAME}\"\n"
 
 /* Write rule in the rule file. Use format from UDEV_RULE_FORMAT */
 int write_rule(struct rule *rule, int fd, int force_part)
--- a/mkinitramfs	2013-09-03 00:47:47.000000000 -0400
+++ b/mkinitramfs	2013-10-14 10:08:28.903316814 -0400
@@ -44,7 +44,7 @@
 	mount /dev/mda1 /root ||  mount /dev/mda /root
 	umount /proc
 	cd /root
-	exec chroot . /sbin/init < /dev/console > /dev/console 2>&1
+	exec chroot . /usr/bin/init < /dev/console > /dev/console 2>&1
 END
 chmod +x initramfs/init
 
--- a/misc/syslog-events	2013-09-03 00:47:47.000000000 -0400
+++ b/misc/syslog-events	2013-10-14 10:08:41.756345204 -0400
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # sample event handling script for mdadm
-# e.g. mdadm --follow --program=/sbin/syslog-events --scan
+# e.g. mdadm --follow --program=/usr/bin/syslog-events --scan
 #
 # License: GPL ver.2
 # Copyright (C) 2004 SEKINE Tatsuo <tsekine@sdri.co.jp>
--- a/mdadm.conf.5	2013-09-03 00:47:47.000000000 -0400
+++ b/mdadm.conf.5	2013-10-14 10:09:59.447835391 -0400
@@ -617,7 +617,7 @@
 .br
 MAILADDR root@mydomain.tld
 .br
-PROGRAM /usr/sbin/handle\-mdadm\-events
+PROGRAM /usr/bin/handle\-mdadm\-events
 .br
 CREATE group=system mode=0640 auto=part\-8
 .br
--- a/mdadm.conf-example	2013-09-03 00:47:47.000000000 -0400
+++ b/mdadm.conf-example	2013-10-14 10:10:52.683239226 -0400
@@ -62,4 +62,4 @@
 #    mdadm --follow --scan & echo $! > /run/mdadm/mon.pid
 # If the lines are not found, mdadm will exit quietly
 #MAILADDR root@mydomain.tld
-#PROGRAM /usr/sbin/handle-mdadm-events
+#PROGRAM /usr/bin/handle-mdadm-events
--- a/README.initramfs	2013-09-03 00:47:47.000000000 -0400
+++ b/README.initramfs	2013-10-14 10:11:08.666193437 -0400
@@ -56,7 +56,7 @@
 mount /dev/mda1 /root ||  mount /dev/mda /root
 umount /proc
 cd /root
-exec chroot . /sbin/init < /dev/console > /dev/console 2>&1
+exec chroot . /usr/bin/init < /dev/console > /dev/console 2>&1
 =============================================
 
 This could certainly be extended, or merged into a larger init script.
--- a/udev-md-raid-arrays.rules	2013-09-03 00:47:47.000000000 -0400
+++ b/udev-md-raid-arrays.rules	2013-10-14 10:23:10.369082859 -0400
@@ -17,7 +17,7 @@
 ATTR{md/array_state}=="|clear|inactive", ENV{SYSTEMD_READY}="0", GOTO="md_end"
 LABEL="md_ignore_state"
 
-IMPORT{program}="/sbin/mdadm --detail --export $devnode"
+IMPORT{program}="/usr/bin/mdadm --detail --export $devnode"
 ENV{DEVTYPE}=="disk", ENV{MD_NAME}=="?*", SYMLINK+="disk/by-id/md-name-$env{MD_NAME}", OPTIONS+="string_escape=replace"
 ENV{DEVTYPE}=="disk", ENV{MD_UUID}=="?*", SYMLINK+="disk/by-id/md-uuid-$env{MD_UUID}"
 ENV{DEVTYPE}=="disk", ENV{MD_DEVNAME}=="?*", SYMLINK+="md/$env{MD_DEVNAME}"