Index: BOOK/boot/64/udev.xml
===================================================================
--- BOOK/boot/64/udev.xml	(revision 97bc24bf87ba29362bb5dc9206be6fba4ea73dfd)
+++ BOOK/boot/64/udev.xml	(revision b0307eff41a768f6bf44e7e2a4abfc160f5b868c)
@@ -9,8 +9,8 @@
   <?dbhtml filename="udev.html"?>
 
-  <title>Udev-&udev-version;</title>
+  <title>Eudev-&udev-version;</title>
 
   <indexterm zone="ch-boot-udev">
-    <primary sortas="a-Udev">Udev</primary>
+    <primary sortas="a-Eudev">Eudev</primary>
     <secondary>boot</secondary>
   </indexterm>
@@ -21,5 +21,5 @@
 
   <sect2 role="installation">
-    <title>Installation of Udev</title>
+    <title>Installation of Eudev</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -27,12 +27,11 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>CC="${CC} ${BUILD64}" LIBS="-lpthread" \
-    BLKID_CFLAGS="-I/tools/include/blkid" BLKID_LIBS="-L/tools/lib64 -lblkid" \
-    KMOD_CFLAGS="-I/tools/include" KMOD_LIBS="-L${CLFS}/lib64 -lkmod" \
-    ./configure --prefix=/usr --build=${CLFS_HOST} --host=${CLFS_TARGET} \
-    --with-rootprefix='' --bindir=/sbin --sysconfdir=/etc --libdir=/usr/lib64 \
-    --disable-introspection --with-usb-ids-path=no --with-pci-ids-path=no \
-    --disable-gtk-doc-html --disable-gudev --disable-keymap --disable-logging \
-    --with-firmware-path=/lib/firmware</userinput></screen>
+<screen os="b"><userinput>BLKID_CFLAGS="-I/tools/include" BLKID_LIBS="-L/tools/lib64 -lblkid" \
+KMOD_CFLAGS="-I/tools/include/" KMOD_LIBS="-L/tools/lib64 -lkmod" \
+CC="${CC} ${BUILD64}" ./configure --prefix=/usr --build=${CLFS_HOST} --host=${CLFS_TARGET} \
+    --with-rootprefix='' --enable-split-usr --sysconfdir=/etc \
+    --libexecdir=/lib64 --libdir=/lib64 --disable-introspection \
+    --disable-gtk-doc-html --disable-gudev --disable-keymap \
+    --with-firmware-path=/lib/firmware --enable-libkmod</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/boot/common/udev.xml
===================================================================
--- BOOK/boot/common/udev.xml	(revision 97bc24bf87ba29362bb5dc9206be6fba4ea73dfd)
+++ BOOK/boot/common/udev.xml	(revision b0307eff41a768f6bf44e7e2a4abfc160f5b868c)
@@ -9,8 +9,8 @@
   <?dbhtml filename="udev.html"?>
 
-  <title>Udev-&udev-version;</title>
+  <title>Eudev-&udev-version;</title>
 
   <indexterm zone="ch-boot-udev">
-    <primary sortas="a-Udev">Udev</primary>
+    <primary sortas="a-Eudev">Eudev</primary>
     <secondary>boot</secondary>
   </indexterm>
@@ -21,5 +21,5 @@
 
   <sect2 role="installation">
-    <title>Installation of Udev</title>
+    <title>Installation of Eudev</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -27,12 +27,11 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>LIBS="-lpthread" \
-    BLKID_CFLAGS="-I/tools/include/blkid" BLKID_LIBS="-L/tools/lib -lblkid" \
-    KMOD_CFLAGS="-I/tools/include" KMOD_LIBS="-L${CLFS}/lib -lkmod" \
-    ./configure --prefix=/usr --build=${CLFS_HOST} --host=${CLFS_TARGET} \
-    --with-rootprefix=$CLFS --bindir=/sbin --sysconfdir=/etc --libexecdir=/lib \
-    --disable-introspection --with-usb-ids-path=no --with-pci-ids-path=no \
-    --disable-gtk-doc-html --disable-gudev --disable-keymap --disable-logging \
-    --with-firmware-path=/lib/firmware</userinput></screen>
+<screen os="b"><userinput>BLKID_CFLAGS="-I/tools/include" BLKID_LIBS="-L/tools/lib -lblkid" \
+KMOD_CFLAGS="-I/tools/include/" KMOD_LIBS="-L/tools/lib -lkmod" \
+./configure --prefix=/usr --build=${CLFS_HOST} --host=${CLFS_TARGET} \
+    --with-rootprefix='' --enable-split-usr --sysconfdir=/etc \
+    --libexecdir=/lib --libdir=/lib --disable-introspection \
+    --disable-gtk-doc-html --disable-gudev --disable-keymap \
+    --with-firmware-path=/lib/firmware --enable-libkmod</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/boot/multilib/udev.xml
===================================================================
--- BOOK/boot/multilib/udev.xml	(revision 97bc24bf87ba29362bb5dc9206be6fba4ea73dfd)
+++ BOOK/boot/multilib/udev.xml	(revision b0307eff41a768f6bf44e7e2a4abfc160f5b868c)
@@ -9,8 +9,8 @@
   <?dbhtml filename="udev.html"?>
 
-  <title>Udev-&udev-version;</title>
+  <title>Eudev-&udev-version;</title>
 
   <indexterm zone="ch-boot-udev">
-    <primary sortas="a-Udev">Udev</primary>
+    <primary sortas="a-Eudev">Eudev</primary>
     <secondary>boot</secondary>
   </indexterm>
@@ -21,5 +21,5 @@
 
   <sect2 role="installation">
-    <title>Installation of Udev</title>
+    <title>Installation of Eudev</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -27,13 +27,11 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>CC="${CC} ${BUILD64}" LIBS="-lpthread" \
-    BLKID_CFLAGS="-I/tools/include/blkid" BLKID_LIBS="-L/tools/lib64 -lblkid" \
-    KMOD_CFLAGS="-I/tools/include" KMOD_LIBS="-L${CLFS}/lib64 -lkmod" \
-    ./configure --prefix=/usr --build=${CLFS_HOST} --host=${CLFS_TARGET} \
-    --with-rootprefix='' --bindir=/sbin --sysconfdir=/etc --libexecdir=/lib \
-    --libdir=/usr/lib64 --disable-introspection \
-    --with-usb-ids-path=no --with-pci-ids-path=no \
-    --disable-gtk-doc-html --disable-gudev --disable-keymap --disable-logging \
-    --with-firmware-path=/lib/firmware</userinput></screen>
+<screen os="b"><userinput>BLKID_CFLAGS="-I/tools/include" BLKID_LIBS="-L/tools/lib64 -lblkid" \
+KMOD_CFLAGS="-I/tools/include/" KMOD_LIBS="-L/tools/lib64 -lkmod" \
+CC="${CC} ${BUILD64}" ./configure --prefix=/usr --build=${CLFS_HOST} --host=${CLFS_TARGET} \
+    --with-rootprefix='' --enable-split-usr --sysconfdir=/etc \
+    --libexecdir=/lib --libdir=/lib64 --disable-introspection \
+    --disable-gtk-doc-html --disable-gudev --disable-keymap \
+    --with-firmware-path=/lib/firmware --enable-libkmod</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/boot/x86_64-64/udev.xml
===================================================================
--- BOOK/boot/x86_64-64/udev.xml	(revision 97bc24bf87ba29362bb5dc9206be6fba4ea73dfd)
+++ BOOK/boot/x86_64-64/udev.xml	(revision b0307eff41a768f6bf44e7e2a4abfc160f5b868c)
@@ -9,8 +9,8 @@
   <?dbhtml filename="udev.html"?>
 
-  <title>Udev-&udev-version;</title>
+  <title>Eudev-&udev-version;</title>
 
   <indexterm zone="ch-boot-udev">
-    <primary sortas="a-Udev">Udev</primary>
+    <primary sortas="a-Eudev">Eudev</primary>
     <secondary>boot</secondary>
   </indexterm>
@@ -21,5 +21,5 @@
 
   <sect2 role="installation">
-    <title>Installation of Udev</title>
+    <title>Installation of Eudev</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -27,13 +27,11 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>CC="${CC} ${BUILD64}" LIBS="-lpthread" \
-    BLKID_CFLAGS="-I/tools/include/blkid" BLKID_LIBS="-L/tools/lib -lblkid" \
-    KMOD_CFLAGS="-I/tools/include" KMOD_LIBS="-L${CLFS}/lib -lkmod" \
-    ./configure --prefix=/usr \
-    --build=${CLFS_HOST} --host=${CLFS_TARGET} \
-    --with-rootprefix='' --bindir=/sbin --sysconfdir=/etc  --libexecdir=/lib \
-    --disable-introspection --with-usb-ids-path=no --with-pci-ids-path=no \
-    --disable-gtk-doc-html --disable-gudev --disable-keymap --disable-logging \
-    --with-firmware-path=/lib/firmware</userinput></screen>
+<screen os="b"><userinput>BLKID_CFLAGS="-I/tools/include" BLKID_LIBS="-L/tools/lib -lblkid" \
+KMOD_CFLAGS="-I/tools/include/" KMOD_LIBS="-L/tools/lib -lkmod" \
+CC="${CC} ${BUILD64}" ./configure --prefix=/usr --build=${CLFS_HOST} --host=${CLFS_TARGET} \
+    --with-rootprefix='' --enable-split-usr --sysconfdir=/etc \
+    --libexecdir=/lib --libdir=/lib --disable-introspection \
+    --disable-gtk-doc-html --disable-gudev --disable-keymap \
+    --with-firmware-path=/lib/firmware --enable-libkmod</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
