Index: BOOK/boot/common/devices.xml
===================================================================
--- BOOK/boot/common/devices.xml	(revision 27931b98636b4e727db2b509db97dd38aac4a16a)
+++ BOOK/boot/common/devices.xml	(revision a4d251f1cc44289d001b07631eef49d3a5a73116)
@@ -35,11 +35,23 @@
     the following commands:</para>
 
-<screen><userinput>mknod -m 600 ${CLFS}/dev/console c 5 1
-mknod -m 666 ${CLFS}/dev/null c 1 3</userinput></screen>
+<screen><userinput>mknod -m 0600 ${CLFS}/dev/console c 5 1
+mknod -m 0666 ${CLFS}/dev/null c 1 3
+mknod -m 0666 ${CLFS}/dev/zero c 1 5</userinput></screen>
 
-    <para>Before udev starts a tmpfs filesystem is mounted over <filename class="directory">/dev</filename> and the previous entries are no-longer available. The folling command creates files that are copied over by the udev bootscript:</para>
+    <para>When systemd starts a tmpfs filesystem is mounted over
+    <filename class="directory">/dev</filename> and the previous entries are
+    no-longer available. The folling command creates files that are copied
+    over when udevd starts:</para>
 
-<screen><userinput>mknod -m 600 ${CLFS}/lib/udev/devices/console c 5 1
-mknod -m 666 ${CLFS}/lib/udev/devices/null c 1 3</userinput></screen>
+<screen><userinput>mkdir -pv ${CLFS}/lib/udev/devices/{pts,shm}
+mknod -m 0600 ${CLFS}/lib/udev/devices/console c 5 1
+mknod -m 0666 ${CLFS}/lib/udev/devices/null c 1 3
+mknod -m 0666 ${CLFS}/lib/udev/devices/zero c 1 5
+mknod -m 0600 ${CLFS}/lib/udev/devices/kmsg c 1 11
+ln -snvf /proc/self/fd ${CLFS}/lib/udev/devices/fd
+ln -snvf /proc/self/fd/0 ${CLFS}/lib/udev/devices/stdin
+ln -snvf /proc/self/fd/1 ${CLFS}/lib/udev/devices/stdout
+ln -snvf /proc/self/fd/2 ${CLFS}/lib/udev/devices/stderr
+ln -snvf /proc/kcore ${CLFS}/lib/udev/devices/core</userinput></screen>
 
   </sect2>
Index: BOOK/final-system/common/coreutils.xml
===================================================================
--- BOOK/final-system/common/coreutils.xml	(revision 27931b98636b4e727db2b509db97dd38aac4a16a)
+++ BOOK/final-system/common/coreutils.xml	(revision a4d251f1cc44289d001b07631eef49d3a5a73116)
@@ -88,13 +88,4 @@
 mv -v /usr/bin/{mv,pwd,rm,rmdir,stty,true,uname} /bin
 mv -v /usr/bin/chroot /usr/sbin</userinput></screen>
-
-    <para os="v">Other Coreutils programs are used by some of the scripts
-    in the CLFS-Bootscripts package. As <filename
-    class="directory">/usr</filename> may not be available during the early
-    stages of booting, those binaries need to be on the root partition:</para>
-
-<screen os="w"><userinput>mv -v /usr/bin/{[,basename,head,install,nice} /bin
-mv -v /usr/bin/{readlink,sleep,sync,test,touch} /bin
-ln -svf ../../bin/install /usr/bin</userinput></screen>
 
   </sect2>
Index: BOOK/final-system/common/kbd.xml
===================================================================
--- BOOK/final-system/common/kbd.xml	(revision 27931b98636b4e727db2b509db97dd38aac4a16a)
+++ BOOK/final-system/common/kbd.xml	(revision a4d251f1cc44289d001b07631eef49d3a5a73116)
@@ -40,10 +40,9 @@
 <screen os="g"><userinput>make install</userinput></screen>
 
-    <para os="h">Some of the programs from Kbd are used by scripts
-    in the CLFS-Bootscripts package. As <filename
-    class="directory">/usr</filename> may not be available during the early
-    stages of booting, those binaries need to be on the root partition:</para>
-
-<screen os="i"><userinput>mv -v /usr/bin/{kbd_mode,dumpkeys,loadkeys,openvt,setfont} /bin</userinput></screen>
+    <para os="h">Some of the programs from Kbd are used by systemd to
+    initialize the system, those binaries need to be on the root
+    partition:</para>
+
+<screen os="i"><userinput>mv -v /usr/bin/{loadkeys,setfont} /bin</userinput></screen>
 
   </sect2>
Index: BOOK/final-system/common/udev.xml
===================================================================
--- BOOK/final-system/common/udev.xml	(revision 27931b98636b4e727db2b509db97dd38aac4a16a)
+++ BOOK/final-system/common/udev.xml	(revision a4d251f1cc44289d001b07631eef49d3a5a73116)
@@ -30,5 +30,6 @@
 <screen os="b"><userinput>./configure --prefix=/usr \
   --exec-prefix="" --sysconfdir=/etc \
-  --libexecdir=/lib/udev --libdir=/usr/lib \
+  --sbindir=/sbin --libexecdir=/lib/udev \
+  --libdir=/usr/lib --with-systemdsystemunitdir=/lib/systemd/system \
   --disable-extras --disable-introspection</userinput></screen>
 
@@ -45,4 +46,25 @@
 
 <screen os="j"><userinput>install -dv /lib/firmware</userinput></screen>
+
+  </sect2>
+
+  <sect2 id="conf-udev" role="configuration">
+    <title>Configuring Udev</title>
+
+    <para>When systemd starts a tmpfs filesystem is mounted over
+    <filename class="directory">/dev</filename> and the previous entries are
+    no-longer available. The folling command creates files that are copied
+    over when udevd starts:</para>
+
+<screen><userinput>mkdir -pv /lib/udev/devices/{pts,shm}
+mknod -m 0600 /lib/udev/devices/console c 5 1
+mknod -m 0666 /lib/udev/devices/null c 1 3
+mknod -m 0666 /lib/udev/devices/zero c 1 5
+mknod -m 0600 /lib/udev/devices/kmsg c 1 11
+ln -snvf /proc/self/fd /lib/udev/devices/fd
+ln -snvf /proc/self/fd/0 /lib/udev/devices/stdin
+ln -snvf /proc/self/fd/1 /lib/udev/devices/stdout
+ln -snvf /proc/self/fd/2 /lib/udev/devices/stderr
+ln -snvf /proc/kcore /lib/udev/devices/core</userinput></screen>
 
   </sect2>
Index: BOOK/final-system/common/util-linux.xml
===================================================================
--- BOOK/final-system/common/util-linux.xml	(revision 27931b98636b4e727db2b509db97dd38aac4a16a)
+++ BOOK/final-system/common/util-linux.xml	(revision a4d251f1cc44289d001b07631eef49d3a5a73116)
@@ -93,10 +93,4 @@
 
 <screen os="h"><userinput>make install</userinput></screen>
-
-    <para os="i">Move the <command>logger</command> binary to
-    <filename class="directory">/bin</filename> as it is needed by the
-    CLFS-Bootscripts package:</para>
-
-<screen os="j"><userinput>mv -v /usr/bin/logger /bin</userinput></screen>
 
   </sect2>
Index: BOOK/final-system/multilib/coreutils.xml
===================================================================
--- BOOK/final-system/multilib/coreutils.xml	(revision 27931b98636b4e727db2b509db97dd38aac4a16a)
+++ BOOK/final-system/multilib/coreutils.xml	(revision a4d251f1cc44289d001b07631eef49d3a5a73116)
@@ -106,12 +106,4 @@
     xpointer="xpointer(//*[@os='u'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/coreutils.xml"
-    xpointer="xpointer(//*[@os='v'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/coreutils.xml"
-    xpointer="xpointer(//*[@os='w'])"/>
-
   </sect2>
 
Index: BOOK/final-system/multilib/udev-64bit.xml
===================================================================
--- BOOK/final-system/multilib/udev-64bit.xml	(revision 27931b98636b4e727db2b509db97dd38aac4a16a)
+++ BOOK/final-system/multilib/udev-64bit.xml	(revision a4d251f1cc44289d001b07631eef49d3a5a73116)
@@ -27,6 +27,8 @@
 
 <screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr \
-  --exec-prefix="" --sysconfdir=/etc --libexecdir=/lib/udev \
-  --libdir=/usr/lib64 --disable-extras --disable-introspection</userinput></screen>
+  --exec-prefix="" --sysconfdir=/etc \
+  --sbindir=/sbin --libexecdir=/lib/udev \
+  --libdir=/usr/lib64 --with-systemdsystemunitdir=/lib/systemd/system \
+  --disable-extras --disable-introspection</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -58,4 +60,8 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
   href="../common/udev.xml"
+  xpointer="xpointer(id('conf-udev'))"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/udev.xml"
   xpointer="xpointer(id('contents-udev'))"/>
 
Index: BOOK/final-system/multilib/udev-n32.xml
===================================================================
--- BOOK/final-system/multilib/udev-n32.xml	(revision 27931b98636b4e727db2b509db97dd38aac4a16a)
+++ BOOK/final-system/multilib/udev-n32.xml	(revision a4d251f1cc44289d001b07631eef49d3a5a73116)
@@ -26,7 +26,9 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>CC="gcc ${BUILDN32}"./configure --prefix=/usr \
-  --exec-prefix="" --sysconfdir=/etc --libexecdir=/lib/udev \
-  --libdir=/usr/lib32 --disable-extras --disable-introspection</userinput></screen>
+<screen os="b"><userinput>CC="gcc ${BUILDN32}" ./configure --prefix=/usr \
+  --exec-prefix="" --sysconfdir=/etc \
+  --sbindir=/sbin --libexecdir=/lib/udev \
+  --libdir=/usr/lib32 --with-systemdsystemunitdir=/lib/systemd/system \
+  --disable-extras --disable-introspection</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/final-system/multilib/udev.xml
===================================================================
--- BOOK/final-system/multilib/udev.xml	(revision 27931b98636b4e727db2b509db97dd38aac4a16a)
+++ BOOK/final-system/multilib/udev.xml	(revision a4d251f1cc44289d001b07631eef49d3a5a73116)
@@ -27,6 +27,8 @@
 
 <screen os="b"><userinput>CC="gcc ${BUILD32}" ./configure --prefix=/usr \
-  --exec-prefix="" --sysconfdir=/etc --libexecdir=/lib/udev \
-  --libdir=/usr/lib --disable-extras --disable-introspection</userinput></screen>
+  --exec-prefix="" --sysconfdir=/etc \
+  --sbindir=/sbin --libexecdir=/lib/udev \
+  --libdir=/usr/lib --with-systemdsystemunitdir=/lib/systemd/system \
+  --disable-extras --disable-introspection</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/final-system/multilib/util-linux-64bit.xml
===================================================================
--- BOOK/final-system/multilib/util-linux-64bit.xml	(revision 27931b98636b4e727db2b509db97dd38aac4a16a)
+++ BOOK/final-system/multilib/util-linux-64bit.xml	(revision a4d251f1cc44289d001b07631eef49d3a5a73116)
@@ -57,12 +57,4 @@
     xpointer="xpointer(//*[@os='h'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
   </sect2>
 
Index: BOOK/final-system/multilib/util-linux-n32.xml
===================================================================
--- BOOK/final-system/multilib/util-linux-n32.xml	(revision 27931b98636b4e727db2b509db97dd38aac4a16a)
+++ BOOK/final-system/multilib/util-linux-n32.xml	(revision a4d251f1cc44289d001b07631eef49d3a5a73116)
@@ -54,12 +54,4 @@
     xpointer="xpointer(//*[@os='h'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
   </sect2>
 
Index: BOOK/final-system/multilib/util-linux.xml
===================================================================
--- BOOK/final-system/multilib/util-linux.xml	(revision 27931b98636b4e727db2b509db97dd38aac4a16a)
+++ BOOK/final-system/multilib/util-linux.xml	(revision a4d251f1cc44289d001b07631eef49d3a5a73116)
@@ -54,12 +54,4 @@
     xpointer="xpointer(//*[@os='h'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
   </sect2>
 
Index: BOOK/materials/common/packages.xml
===================================================================
--- BOOK/materials/common/packages.xml	(revision 27931b98636b4e727db2b509db97dd38aac4a16a)
+++ BOOK/materials/common/packages.xml	(revision a4d251f1cc44289d001b07631eef49d3a5a73116)
@@ -484,4 +484,13 @@
 
     <varlistentry>
+      <term>systemd (&systemd-version;) - <token>&systemd-size;</token>:</term>
+      <listitem>
+        <para>Home page: <ulink url="&systemd-home;"/></para>
+        <para>Download: <ulink url="&systemd-url;"/></para>
+        <para>MD5 sum: <literal>&systemd-md5;</literal></para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
       <term>Tar (&tar-version;) - <token>&tar-size;</token>:</term>
       <listitem>
Index: BOOK/packages.ent
===================================================================
--- BOOK/packages.ent	(revision 27931b98636b4e727db2b509db97dd38aac4a16a)
+++ BOOK/packages.ent	(revision a4d251f1cc44289d001b07631eef49d3a5a73116)
@@ -389,4 +389,10 @@
 <!ENTITY sysvinit-home "http://savannah.nongnu.org/projects/sysvinit">
 
+<!ENTITY systemd-version "17">
+<!ENTITY systemd-size "738 KB">
+<!ENTITY systemd-url "http://www.freedesktop.org/software/systemd/systemd-&systemd-version;.tar.bz2">
+<!ENTITY systemd-md5 "ae69109af0628c083846b8aea921692c">
+<!ENTITY systemd-home "http://freedesktop.org/wiki/Software/systemd">
+
 <!ENTITY tar-version "1.25">
 <!ENTITY tar-size "2,276 KB">
