Index: BOOK/final-system/common/e2fsprogs.xml
===================================================================
--- BOOK/final-system/common/e2fsprogs.xml	(revision afd5ee2fba5a38102a91578d9f89fc3ba8b80563)
+++ BOOK/final-system/common/e2fsprogs.xml	(revision 8119e26a1365d5d413621c7aff12f1e5a164f17f)
@@ -29,4 +29,10 @@
     <title>Installation of E2fsprogs</title>
 
+    <para os="s1">Fix a potential security issue identified upstream:</para>
+
+<screen os="s2"><userinput>sed -e '/int.*old_desc_blocks/s/int/blk64_t/' \
+    -e '/if (old_desc_blocks/s/super->s_first_meta_bg/desc_blocks/' \
+    -i lib/ext2fs/closefs.c</userinput></screen>
+
     <para os="a">The E2fsprogs documentation recommends that the package be
     built in a subdirectory of the source tree:</para>
@@ -37,8 +43,7 @@
     <para os="c">Prepare E2fsprogs for compilation:</para>
 
-<screen os="d"><userinput>../configure --prefix=/usr --with-root-prefix="" \
-    --enable-elf-shlibs --disable-libblkid \
-    --disable-libuuid --disable-fsck \
-    --disable-uuidd</userinput></screen>
+<screen os="d"><userinput>../configure --prefix=/usr --bindir=/bin \
+    --with-root-prefix="" --enable-elf-shlibs --disable-libblkid \
+    --disable-libuuid --disable-fsck --disable-uuidd</userinput></screen>
 
     <variablelist os="e">
Index: BOOK/final-system/multilib/e2fsprogs-64bit.xml
===================================================================
--- BOOK/final-system/multilib/e2fsprogs-64bit.xml	(revision afd5ee2fba5a38102a91578d9f89fc3ba8b80563)
+++ BOOK/final-system/multilib/e2fsprogs-64bit.xml	(revision 8119e26a1365d5d413621c7aff12f1e5a164f17f)
@@ -29,4 +29,12 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="e2fsprogs.xml"
+    xpointer="xpointer(//*[@os='s1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="e2fsprogs.xml"
+    xpointer="xpointer(//*[@os='s2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="e2fsprogs.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
@@ -41,8 +49,7 @@
 <screen os="d"><userinput>PKG_CONFIG_PATH="${PKG_CONFIG_PATH64}" \
 CC="gcc ${BUILD64}"  \
-../configure --prefix=/usr --with-root-prefix="" \
-    --enable-elf-shlibs --disable-libblkid \
-    --disable-libuuid --disable-fsck \
-    --disable-uuidd</userinput></screen>
+../configure --prefix=/usr --bindir=/bin --with-root-prefix="" \
+    --enable-elf-shlibs --disable-libblkid --disable-libuuid \
+    --disable-fsck --disable-uuidd</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/final-system/multilib/e2fsprogs-n32.xml
===================================================================
--- BOOK/final-system/multilib/e2fsprogs-n32.xml	(revision afd5ee2fba5a38102a91578d9f89fc3ba8b80563)
+++ BOOK/final-system/multilib/e2fsprogs-n32.xml	(revision 8119e26a1365d5d413621c7aff12f1e5a164f17f)
@@ -30,4 +30,12 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="e2fsprogs.xml"
+    xpointer="xpointer(//*[@os='s1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="e2fsprogs.xml"
+    xpointer="xpointer(//*[@os='s2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="e2fsprogs.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
@@ -42,8 +50,7 @@
 <screen os="d"><userinput>PKG_CONFIG_PATH="${PKG_CONFIG_PATHN32}" \
 CC="gcc ${BUILDN32}" \
-../configure --prefix=/usr --with-root-prefix="" \
-    --enable-elf-shlibs --disable-libblkid \
-    --disable-libuuid --disable-fsck \
-    --disable-uuidd</userinput></screen>
+../configure --prefix=/usr --bindir=/bin --with-root-prefix="" \
+    --enable-elf-shlibs --disable-libblkid --disable-libuuid \
+    --disable-fsck --disable-uuidd</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/final-system/multilib/e2fsprogs.xml
===================================================================
--- BOOK/final-system/multilib/e2fsprogs.xml	(revision afd5ee2fba5a38102a91578d9f89fc3ba8b80563)
+++ BOOK/final-system/multilib/e2fsprogs.xml	(revision 8119e26a1365d5d413621c7aff12f1e5a164f17f)
@@ -25,4 +25,12 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/e2fsprogs.xml"
+    xpointer="xpointer(//*[@os='s1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/e2fsprogs.xml"
+    xpointer="xpointer(//*[@os='s2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/e2fsprogs.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
@@ -37,8 +45,7 @@
 <screen os="d"><userinput>PKG_CONFIG_PATH="${PKG_CONFIG_PATH32}" \
 CC="gcc ${BUILD32}" \
-../configure --prefix=/usr --with-root-prefix="" \
-    --enable-elf-shlibs --disable-libblkid \
-    --disable-libuuid --disable-fsck \
-    --disable-uuidd</userinput></screen>
+../configure --prefix=/usr --bindir=/bin --with-root-prefix="" \
+    --enable-elf-shlibs --disable-libblkid --disable-libuuid \
+    --disable-fsck --disable-uuidd</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
