Index: general.ent
===================================================================
--- general.ent	(revision 6dc6bf47da8a27ddd623009a49ed40811d823a8a)
+++ general.ent	(revision f350508b4a895ae72a81f56aca6714488688bc01)
@@ -1,5 +1,5 @@
 <!-- $LastChangedBy$ $Date$ -->
 
-<!ENTITY day          "08">                   <!-- Always 2 digits -->
+<!ENTITY day          "09">                   <!-- Always 2 digits -->
 <!ENTITY month        "06">                   <!-- Always 2 digits -->
 <!ENTITY year         "2014">
@@ -7,5 +7,5 @@
 <!ENTITY copyholder   "The BLFS Development Team">
 <!ENTITY version      "&year;-&month;-&day;">
-<!ENTITY releasedate  "June 8th, &year;">
+<!ENTITY releasedate  "June 9th, &year;">
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 6dc6bf47da8a27ddd623009a49ed40811d823a8a)
+++ introduction/welcome/changelog.xml	(revision f350508b4a895ae72a81f56aca6714488688bc01)
@@ -45,10 +45,20 @@
 -->
     <listitem>
-      <para>June 8th, 2014</para>
-      <itemizedlist>
+      <para>June 9th, 2014</para>
+      <itemizedlist>
+        <listitem>
+          <para>[pierre] - Improve detection and handling of udevd in
+          mkinitramfs.</para>
+        </listitem>
         <listitem>
           <para>[pierre] - Eudev-1.7 (Udev-extras). Fixes
           <ulink url="&blfs-ticket-root;5128">#5128</ulink>.</para>
         </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>June 8th, 2014</para>
+      <itemizedlist>
         <listitem>
           <para>[fernando] - MariaDB-10.0.11: move switch
Index: postlfs/filesystems/initramfs.xml
===================================================================
--- postlfs/filesystems/initramfs.xml	(revision 6dc6bf47da8a27ddd623009a49ed40811d823a8a)
+++ postlfs/filesystems/initramfs.xml	(revision f350508b4a895ae72a81f56aca6714488688bc01)
@@ -95,8 +95,11 @@
 binfiles="$binfiles umount sed sleep ln rm uname"
 
-sbinfiles="udevadm modprobe blkid switch_root"
+# Systemd installs udevadm in /bin. Other udev implementations have it in /sbin
+if [ -x /bin/udevadm ] ; then binfiles="$binfiles udevadm"; fi
+
+sbinfiles="modprobe blkid switch_root"
 
 #Optional files and locations
-for f in mdadm udevd; do
+for f in mdadm udevd udevadm; do
   if [ -x /sbin/$f ] ; then sbinfiles="$sbinfiles $f"; fi
 done
@@ -132,5 +135,5 @@
 cp -a /lib/firmware $WDIR/lib
 
-# Copy the RAID configureation file if present
+# Copy the RAID configuration file if present
 if [ -f /etc/mdadm.conf ] ; then
   cp /etc/mdadm.conf $WDIR/etc
@@ -165,5 +168,7 @@
 # Add udevd libraries if not in /sbin
 if [ -x /lib/udev/udevd ] ; then
-  ldd /lib/udev/udevd | sed "s/\t//" | cut -d " " -f1 >> $unsorted
+  ldd /lib/udev/udevd | sed "s/\t//" | cut -d " " -f1 &gt;&gt; $unsorted
+elif [ -x /lib/systemd/systemd-udevd ] ; then
+  ldd /lib/systemd/systemd-udevd | sed "s/\t//" | cut -d " " -f1 &gt;&gt; $unsorted
 fi
 
@@ -209,5 +214,10 @@
 done
 
-cp -a /lib/udev $WDIR/lib
+if [ -d /lib/udev ]; then
+  cp -a /lib/udev $WDIR/lib
+fi
+if [ -d /lib/systemd ]; then
+  cp -a /lib/systemd $WDIR/lib
+fi
 
 # Install the kernel modules if requested
@@ -322,10 +332,15 @@
 # udevd location depends on version
 if [ -x /sbin/udevd ]; then
-  UDEV_PATH=/sbin
+  UDEVD=/sbin/udevd
+elif [ -x /lib/udev/udevd ]; then
+  UDEVD=/lib/udev/udevd
+elif [ -x /lib/systemd/systemd-udevd ]; then
+  UDEVD=/lib/systemd/systemd-udevd
 else
-  UDEV_PATH=/lib/udev
-fi
-
-${UDEV_PATH}/udevd --daemon --resolve-names=never
+  echo "Cannot find udevd nor systemd-udevd"
+  problem
+fi
+
+${UDEVD} --daemon --resolve-names=never
 udevadm trigger
 udevadm settle
@@ -337,5 +352,5 @@
 do_mount_root
 
-killall -w ${UDEV_PATH}/udevd
+killall -w ${UDEVD##*/}
 
 exec switch_root /.root "$init" "$@"
