diff --git a/chapter05/libstdc++.xml b/chapter05/libstdc++.xml
index 0153766c4..6dacb059e 100644
--- a/chapter05/libstdc++.xml
+++ b/chapter05/libstdc++.xml
@@ -37,8 +37,8 @@
       <segtitle>&diskspace;</segtitle>
 
       <seglistitem>
-        <seg>&libstdcpp-tmp-sbu;</seg>
-        <seg>&libstdcpp-tmp-du;</seg>
+        <seg>&libstdcpp-tmpp1-sbu;</seg>
+        <seg>&libstdcpp-tmpp1-du;</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/chapter07/libstdc++-pass2.xml b/chapter07/libstdc++-pass2.xml
index 903400bda..015d8d8ea 100644
--- a/chapter07/libstdc++-pass2.xml
+++ b/chapter07/libstdc++-pass2.xml
@@ -35,8 +35,8 @@
       <segtitle>&diskspace;</segtitle>
 
       <seglistitem>
-        <seg>&libstdcpp-tmp-sbu;</seg>
-        <seg>&libstdcpp-tmp-du;</seg>
+        <seg>&libstdcpp-tmpp2-sbu;</seg>
+        <seg>&libstdcpp-tmpp2-du;</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/general.ent b/general.ent
index 397b14095..92a0e9705 100644
--- a/general.ent
+++ b/general.ent
@@ -1,13 +1,13 @@
-<!ENTITY version         "20200611-cross2">
+<!ENTITY version         "20200612-cross2">
 <!ENTITY short-version   "svn">  <!-- Used below in &blfs-book; 
                                       Change to x.y for release but not -rc releases -->
 <!ENTITY generic-version "cross-chap5"> <!-- Use "development"  or "x.y[-pre{x}]" -->
 
-<!ENTITY versiond        "20200611-cross2-systemd">
+<!ENTITY versiond        "20200612-cross2-systemd">
 <!ENTITY short-versiond  "systemd">
-<!ENTITY generic-versiond "20200611-cross2-systemd"> 
+<!ENTITY generic-versiond "20200612-cross2-systemd"> 
 
-<!ENTITY releasedate     "June 11th, 2020">
+<!ENTITY releasedate     "June 12th, 2020">
 
 <!ENTITY copyrightdate   "1999-2020"><!-- jhalfs needs a literal dash, not &ndash; -->
 
diff --git a/packages.ent b/packages.ent
index dd8a9b401..102a58c7b 100644
--- a/packages.ent
+++ b/packages.ent
@@ -18,7 +18,7 @@
 <!ENTITY acl-url "&savannah;/releases/acl/acl-&acl-version;.tar.gz">
 <!ENTITY acl-md5 "007aabf1dbb550bcddde52a244cd1070">
 <!ENTITY acl-home "&savannah-nongnu;/projects/acl">
-<!ENTITY acl-fin-du "6.4 MB">
+<!ENTITY acl-fin-du "6.2 MB">
 <!ENTITY acl-fin-sbu "0.1 SBU">
 
 <!ENTITY attr-version "2.4.48">
@@ -35,7 +35,7 @@
 <!ENTITY autoconf-md5 "50f97f4159805e374639a73e2636f22e">
 <!ENTITY autoconf-home "&gnu-software;autoconf/">
 <!ENTITY autoconf-fin-du "79 MB">
-<!ENTITY autoconf-fin-sbu-tests "3.2">
+<!ENTITY autoconf-fin-sbu-tests "3.3">
 <!ENTITY autoconf-fin-sbu "less than 0.1 SBU (about &autoconf-fin-sbu-tests; SBU with tests)">
 
 <!ENTITY automake-version "1.16.2">
@@ -45,24 +45,24 @@
 <!ENTITY automake-md5 "6cb234c86f3f984df29ce758e6d0d1d7">
 <!ENTITY automake-home "&gnu-software;automake/">
 <!ENTITY automake-fin-du "107 MB">
-<!ENTITY automake-fin-sbu "less than 0.1 SBU (about 8.1 SBU with tests)">
+<!ENTITY automake-fin-sbu "less than 0.1 SBU (about 8 SBU with tests)">
 
 <!ENTITY bash-version "5.0">
 <!ENTITY bash-size "9,898 KB">
 <!ENTITY bash-url "&gnu;bash/bash-&bash-version;.tar.gz">
 <!ENTITY bash-md5 "2b44b47b905be16f45709648f671820b">
 <!ENTITY bash-home "&gnu-software;bash/">
-<!ENTITY bash-tmp-du "67 MB">
+<!ENTITY bash-tmp-du "64 MB">
 <!ENTITY bash-tmp-sbu "0.4 SBU">
-<!ENTITY bash-fin-du "62 MB">
-<!ENTITY bash-fin-sbu "1.9 SBU">
+<!ENTITY bash-fin-du "48 MB">
+<!ENTITY bash-fin-sbu "1.8 SBU">
 
 <!ENTITY bc-version "2.7.2">
 <!ENTITY bc-size "185 KB">
 <!ENTITY bc-url "https://github.com/gavinhoward/bc/releases/download/&bc-version;/bc-&bc-version;.tar.xz">
 <!ENTITY bc-md5 "28235ceaf2280b909591ace7a3a4f051">
 <!ENTITY bc-home "https://github.com/gavinhoward/bc">
-<!ENTITY bc-fin-du "2.9 MB">
+<!ENTITY bc-fin-du "3.2 MB">
 <!ENTITY bc-fin-sbu "0.1 SBU">
 
 <!ENTITY binutils-version "2.34">
@@ -70,32 +70,35 @@
 <!ENTITY binutils-url "&gnu;binutils/binutils-&binutils-version;.tar.xz">
 <!ENTITY binutils-md5 "664ec3a2df7805ed3464639aaae332d6">
 <!ENTITY binutils-home "&gnu-software;binutils/">
-<!ENTITY binutils-tmpp1-du "625 MB">
+<!ENTITY binutils-tmpp1-du "611 MB">
 <!ENTITY binutils-tmpp1-sbu "1 SBU">
-<!ENTITY binutils-tmpp2-du "651 MB">
-<!ENTITY binutils-tmpp2-sbu "1.1 SBU">
-<!ENTITY binutils-fin-du "5.1 GB">
-<!ENTITY binutils-fin-sbu "6.7 SBU">
+<!ENTITY binutils-tmpp2-du "492 MB">
+<!ENTITY binutils-tmpp2-sbu "1.2 SBU">
+<!ENTITY binutils-fin-du "4.7 GB">
+<!ENTITY binutils-fin-sbu "6.6 SBU">
 
 <!ENTITY bison-version "3.6.3">
 <!ENTITY bison-size "2,416 KB">
 <!ENTITY bison-url "&gnu;bison/bison-&bison-version;.tar.xz">
 <!ENTITY bison-md5 "ca0513e77de1de46b9f2419d175cb3b4">
 <!ENTITY bison-home "&gnu-software;bison/">
-<!ENTITY bison-tmp-du "43 MB">
+<!ENTITY bison-tmp-du "47 MB">
 <!ENTITY bison-tmp-sbu "0.3 SBU">
-<!ENTITY bison-fin-du "52 MB">
-<!ENTITY bison-fin-sbu "5.8 SBU">
+<!ENTITY bison-fin-du "50 MB">
+<!ENTITY bison-fin-sbu "5.6 SBU">
 
 <!ENTITY bzip2-version "1.0.8">
 <!ENTITY bzip2-size "792 KB">
 <!ENTITY bzip2-url "https://www.sourceware.org/pub/bzip2/bzip2-&bzip2-version;.tar.gz">
 <!ENTITY bzip2-md5 "67e051268d0c475ea773822f7500d0e5">
+<!ENTITY bzip2-home " ">
 <!--<!ENTITY bzip2-home "http://www.bzip.org/">-->
+<!-- No more bzip2 in temp tools
 <!ENTITY bzip2-tmp-du "6.4 MB">
-<!ENTITY bzip2-tmp-sbu "less than 0.1 SBU">
+<!ENTITY bzip2-tmp-sbu "less than 0.1 SBU">-->
 <!ENTITY bzip2-fin-du "7.7 MB">
 <!ENTITY bzip2-fin-sbu "less than 0.1 SBU">
+<!-- Does not seem to be used in this book
 
 <!ENTITY ref5-version "&version;">
 <!ENTITY ref5-size "REF5-SUM KB">
@@ -106,24 +109,24 @@
 <!ENTITY ref6-size "REF6-SUM KB">
 <!ENTITY ref6-url "&anduin-sources;/reference-files/chapter6-files-&version;.ref">
 <!ENTITY ref6-md5 "REF6-MD5SUM">
-
+-->
 <!ENTITY check-version "0.14.0">
 <!ENTITY check-size "753 KB">
 <!ENTITY check-url "&github;/libcheck/check/releases/download/&check-version;/check-&check-version;.tar.gz">
 <!ENTITY check-md5 "270e82a445be6026040267a5e11cc94b">
 <!ENTITY check-home "https://libcheck.github.io/check">
-<!ENTITY check-fin-du "13 MB">
-<!ENTITY check-fin-sbu "0.1 SBU (about 3.5 SBU with tests)">
+<!ENTITY check-fin-du "12 MB">
+<!ENTITY check-fin-sbu "0.1 SBU (about 3.3 SBU with tests)">
 
 <!ENTITY coreutils-version "8.32">
 <!ENTITY coreutils-size "5,418 KB">
 <!ENTITY coreutils-url "&gnu;coreutils/coreutils-&coreutils-version;.tar.xz">
 <!ENTITY coreutils-md5 "022042695b7d5bcf1a93559a9735e668">
 <!ENTITY coreutils-home "&gnu-software;coreutils/">
-<!ENTITY coreutils-tmp-du "157 MB">
-<!ENTITY coreutils-tmp-sbu "0.7 SBU">
-<!ENTITY coreutils-fin-du "202 MB">
-<!ENTITY coreutils-fin-sbu "2.3 SBU">
+<!ENTITY coreutils-tmp-du "170 MB">
+<!ENTITY coreutils-tmp-sbu "0.6 SBU">
+<!ENTITY coreutils-fin-du "157 MB">
+<!ENTITY coreutils-fin-sbu "2.6 SBU">
 
 <!ENTITY dbus-version "1.12.18">
 <!ENTITY dbus-size "2,048 KB">
@@ -138,7 +141,7 @@
 <!ENTITY dejagnu-url "&gnu;dejagnu/dejagnu-&dejagnu-version;.tar.gz">
 <!ENTITY dejagnu-md5 "e1b07516533f351b3aba3423fafeffd6">
 <!ENTITY dejagnu-home "&gnu-software;dejagnu/">
-<!ENTITY dejagnu-tmp-du "3.2 MB">
+<!ENTITY dejagnu-tmp-du "4.6 MB">
 <!ENTITY dejagnu-tmp-sbu "less than 0.1 SBU">
 
 <!ENTITY diffutils-version "3.7">
@@ -148,7 +151,7 @@
 <!ENTITY diffutils-home "&gnu-software;diffutils/">
 <!ENTITY diffutils-tmp-du "26 MB">
 <!ENTITY diffutils-tmp-sbu "0.2 SBU">
-<!ENTITY diffutils-fin-du "36 MB">
+<!ENTITY diffutils-fin-du "33 MB">
 <!ENTITY diffutils-fin-sbu "0.4 SBU">
 
 <!ENTITY e2fsprogs-version "1.45.6">
@@ -156,22 +159,22 @@
 <!ENTITY e2fsprogs-url "https://downloads.sourceforge.net/project/e2fsprogs/e2fsprogs/v&e2fsprogs-version;/e2fsprogs-&e2fsprogs-version;.tar.gz">
 <!ENTITY e2fsprogs-md5 "cccfb706d162514e4f9dbfbc9e5d65ee">
 <!ENTITY e2fsprogs-home "http://e2fsprogs.sourceforge.net/">
-<!ENTITY e2fsprogs-fin-du "108 MB">
-<!ENTITY e2fsprogs-fin-sbu "1.6 SBU">
+<!ENTITY e2fsprogs-fin-du "106 MB">
+<!ENTITY e2fsprogs-fin-sbu "4.4 SBU">
 
 <!ENTITY elfutils-version "0.179">
 <!ENTITY elfutils-size "8,846 KB">
 <!ENTITY elfutils-url "https://sourceware.org/ftp/elfutils/&elfutils-version;/elfutils-&elfutils-version;.tar.bz2">
 <!ENTITY elfutils-md5 "8ee56b371b5a7ea081284c44e5164600">
 <!ENTITY elfutils-home "https://sourceware.org/ftp/elfutils/">
-<!ENTITY elfutils-fin-du "124 MB">
-<!ENTITY elfutils-fin-sbu "0.9 SBU">
+<!ENTITY elfutils-fin-du "121 MB">
+<!ENTITY elfutils-fin-sbu "1.0 SBU">
 
 <!ENTITY eudev-version "3.2.9">
 <!ENTITY eudev-size "1,914 KB">
 <!ENTITY eudev-url "https://dev.gentoo.org/~blueness/eudev/eudev-&eudev-version;.tar.gz">
 <!ENTITY eudev-md5 "dedfb1964f6098fe9320de827957331f">
-<!ENTITY eudev-fin-du "83 MB">
+<!ENTITY eudev-fin-du "82 MB">
 <!ENTITY eudev-fin-sbu "0.2 SBU">
 
 <!ENTITY expat-version "2.2.9">
@@ -179,7 +182,7 @@
 <!ENTITY expat-url "&sourceforge;expat/expat-&expat-version;.tar.xz">
 <!ENTITY expat-md5 "d2384fa607223447e713e1b9bd272376">
 <!ENTITY expat-home "https://libexpat.github.io/">
-<!ENTITY expat-fin-du "11 MB">
+<!ENTITY expat-fin-du "14 MB">
 <!ENTITY expat-fin-sbu "0.1 SBU">
 
 <!ENTITY expect-version "5.45.4">
@@ -188,7 +191,7 @@
 <!ENTITY expect-url "&sourceforge;expect/expect&expect-version;.tar.gz">
 <!ENTITY expect-md5 "00fce8de158422f5ccd2666512329bd2">
 <!ENTITY expect-home "https://core.tcl.tk/expect/">
-<!ENTITY expect-tmp-du "4.0 MB">
+<!ENTITY expect-tmp-du "3.9 MB">
 <!ENTITY expect-tmp-sbu "0.1 SBU">
 
 <!ENTITY file-version "5.38">
@@ -198,7 +201,7 @@
 <!ENTITY file-home "https://www.darwinsys.com/file/">
 <!ENTITY file-tmp-du "20 MB">
 <!ENTITY file-tmp-sbu "0.1 SBU">
-<!ENTITY file-fin-du "20 MB">
+<!ENTITY file-fin-du "13 MB">
 <!ENTITY file-fin-sbu "0.1 SBU">
 
 <!ENTITY findutils-version "4.7.0">
@@ -206,9 +209,9 @@
 <!ENTITY findutils-url "&gnu;findutils/findutils-&findutils-version;.tar.xz">
 <!ENTITY findutils-md5 "731356dec4b1109b812fecfddfead6b2">
 <!ENTITY findutils-home "&gnu-software;findutils/">
-<!ENTITY findutils-tmp-du "39 MB">
-<!ENTITY findutils-tmp-sbu "0.3 SBU">
-<!ENTITY findutils-fin-du "57 MB">
+<!ENTITY findutils-tmp-du "40 MB">
+<!ENTITY findutils-tmp-sbu "0.2 SBU">
+<!ENTITY findutils-fin-du "51 MB">
 <!ENTITY findutils-fin-sbu "0.7 SBU">
 
 <!ENTITY flex-version "2.6.4">
@@ -216,8 +219,9 @@
 <!ENTITY flex-url "&github;/westes/flex/releases/download/v&flex-version;/flex-&flex-version;.tar.gz">
 <!ENTITY flex-md5 "2882e3179748cc9f9c23ec593d6adc8d">
 <!ENTITY flex-home "&github;/westes/flex">
+<!-- only in final system now
 <!ENTITY flex-tmp-du "15 MB">
-<!ENTITY flex-tmp-sbu "0.1 SBU">
+<!ENTITY flex-tmp-sbu "0.1 SBU">-->
 <!ENTITY flex-fin-du "36 MB">
 <!ENTITY flex-fin-sbu "0.4 SBU">
 
@@ -228,7 +232,7 @@
 <!ENTITY gawk-home "&gnu-software;gawk/">
 <!ENTITY gawk-tmp-du "46 MB">
 <!ENTITY gawk-tmp-sbu "0.2 SBU">
-<!ENTITY gawk-fin-du "47 MB">
+<!ENTITY gawk-fin-du "43 MB">
 <!ENTITY gawk-fin-sbu "0.4 SBU">
 
 <!ENTITY gcc-version "10.1.0">
@@ -236,11 +240,11 @@
 <!ENTITY gcc-url "&gnu;gcc/gcc-&gcc-version;/gcc-&gcc-version;.tar.xz">
 <!ENTITY gcc-md5 "7d48e00245330c48b670ec9a2c518291">
 <!ENTITY gcc-home "https://gcc.gnu.org/">
-<!ENTITY gcc-tmpp1-du "3.9 GB">
-<!ENTITY gcc-tmpp1-sbu "12 SBU">
-<!ENTITY gcc-tmpp2-du "4.3 GB">
-<!ENTITY gcc-tmpp2-sbu "14 SBU">
-<!ENTITY gcc-fin-du "4.9 GB ">
+<!ENTITY gcc-tmpp1-du "3.7 GB">
+<!ENTITY gcc-tmpp1-sbu "11 SBU">
+<!ENTITY gcc-tmpp2-du "3.6 GB">
+<!ENTITY gcc-tmpp2-sbu "11 SBU">
+<!ENTITY gcc-fin-du "4.4 GB ">
 <!ENTITY gcc-fin-sbu "103 SBU (with tests)">
 <!ENTITY libquadmath-version "0.0.0">
 <!ENTITY libstdcpp-version   "6.0.28">
@@ -250,8 +254,10 @@
 <!--<!ENTITY libmpxwrap-version  "2.0.1">-->
 <!--<!ENTITY libcilkrts-version  "5.0.0">-->
 
-<!ENTITY libstdcpp-tmp-du "878 MB">
-<!ENTITY libstdcpp-tmp-sbu "0.5 SBU">
+<!ENTITY libstdcpp-tmpp1-du "952 MB">
+<!ENTITY libstdcpp-tmpp1-sbu "0.4 SBU">
+<!ENTITY libstdcpp-tmpp2-du "1.1 GB">
+<!ENTITY libstdcpp-tmpp2-sbu "1.1 SBU">
 
 <!ENTITY gdbm-version "1.18.1">
 <!ENTITY gdbm-size "920 KB">
@@ -266,19 +272,19 @@
 <!ENTITY gettext-url "&gnu;gettext/gettext-&gettext-version;.tar.xz">
 <!ENTITY gettext-md5 "0cf5f68338d5d941bbf9ac93b847310f">
 <!ENTITY gettext-home "&gnu-software;gettext/">
-<!ENTITY gettext-tmp-du "300 MB">
-<!ENTITY gettext-tmp-sbu "1.6 SBU">
-<!ENTITY gettext-fin-du "249 MB">
-<!ENTITY gettext-fin-sbu "2.7 SBU">
+<!ENTITY gettext-tmp-du "303 MB">
+<!ENTITY gettext-tmp-sbu "1.7 SBU">
+<!ENTITY gettext-fin-du "231 MB">
+<!ENTITY gettext-fin-sbu "2.8 SBU">
 
 <!ENTITY glibc-version "2.31">
 <!ENTITY glibc-size "16,286 KB">
 <!ENTITY glibc-url "&gnu;glibc/glibc-&glibc-version;.tar.xz">
 <!ENTITY glibc-md5 "78a720f17412f3c3282be5a6f3363ec6">
 <!ENTITY glibc-home "&gnu-software;libc/">
-<!ENTITY glibc-tmp-du "896 MB">
-<!ENTITY glibc-tmp-sbu "4.5 SBU">
-<!ENTITY glibc-fin-du "5.5 GB">
+<!ENTITY glibc-tmp-du "750 MB">
+<!ENTITY glibc-tmp-sbu "4.2 SBU">
+<!ENTITY glibc-fin-du "2.6 GB">
 <!ENTITY glibc-fin-sbu "19 SBU">
 <!ENTITY libthread_db-version "1.0">
 
@@ -295,7 +301,7 @@
 <!ENTITY gperf-url "&gnu;gperf/gperf-&gperf-version;.tar.gz">
 <!ENTITY gperf-md5 "9e251c0a618ad0824b51117d5d9db87e">
 <!ENTITY gperf-home "&gnu-software;gperf/">
-<!ENTITY gperf-fin-du "6.3 MB">
+<!ENTITY gperf-fin-du "6.4 MB">
 <!ENTITY gperf-fin-sbu "less than 0.1 SBU">
 
 <!ENTITY grep-version "3.4">
@@ -303,9 +309,9 @@
 <!ENTITY grep-url "&gnu;grep/grep-&grep-version;.tar.xz">
 <!ENTITY grep-md5 "111b117d22d6a7d049d6ae7505e9c4d2">
 <!ENTITY grep-home "&gnu-software;grep/">
-<!ENTITY grep-tmp-du "25 MB">
+<!ENTITY grep-tmp-du "26 MB">
 <!ENTITY grep-tmp-sbu "0.2 SBU">
-<!ENTITY grep-fin-du "39 MB">
+<!ENTITY grep-fin-du "37 MB">
 <!ENTITY grep-fin-sbu "0.7 SBU">
 
 <!ENTITY groff-version "1.22.4">
@@ -313,7 +319,7 @@
 <!ENTITY groff-url "&gnu;groff/groff-&groff-version;.tar.gz">
 <!ENTITY groff-md5 "08fb04335e2f5e73f23ea4c3adbf0c5f">
 <!ENTITY groff-home "&gnu-software;groff/">
-<!ENTITY groff-fin-du "95 MB">
+<!ENTITY groff-fin-du "96 MB">
 <!ENTITY groff-fin-sbu "0.5 SBU">
 
 <!ENTITY grub-version "2.04">
@@ -321,7 +327,7 @@
 <!ENTITY grub-url "https://ftp.gnu.org/gnu/grub/grub-&grub-version;.tar.xz">
 <!ENTITY grub-md5 "5aaca6713b47ca2456d8324a58755ac7">
 <!ENTITY grub-home "&gnu-software;grub/">
-<!ENTITY grub-fin-du "161 MB">
+<!ENTITY grub-fin-du "154 MB">
 <!ENTITY grub-fin-sbu "0.8 SBU">
 
 <!ENTITY gzip-version "1.10">
@@ -331,7 +337,7 @@
 <!ENTITY gzip-home "&gnu-software;gzip/">
 <!ENTITY gzip-tmp-du "10 MB">
 <!ENTITY gzip-tmp-sbu "0.1 SBU">
-<!ENTITY gzip-fin-du "20 MB">
+<!ENTITY gzip-fin-du "19 MB">
 <!ENTITY gzip-fin-sbu "0.1 SBU">
 
 <!ENTITY iana-etc-version "20200429">
@@ -403,7 +409,7 @@
 <!ENTITY libcap-url "&kernel;linux/libs/security/linux-privs/libcap2/libcap-&libcap-version;.tar.xz">
 <!ENTITY libcap-md5 "3d8cd4a87650cdee130691cb110c2ce2">
 <!ENTITY libcap-home "https://sites.google.com/site/fullycapable/">
-<!ENTITY libcap-fin-du "8.5 MB">
+<!ENTITY libcap-fin-du "11 MB">
 <!ENTITY libcap-fin-sbu "less than 0.1 SBU">
 
 <!ENTITY libffi-version "3.3">
@@ -419,8 +425,8 @@
 <!ENTITY libpipeline-url "&savannah;/releases/libpipeline/libpipeline-&libpipeline-version;.tar.gz">
 <!ENTITY libpipeline-md5 "169de4cc1f6f7f7d430a5bed858b2fd3">
 <!ENTITY libpipeline-home "http://libpipeline.nongnu.org/">
-<!ENTITY libpipeline-fin-du "9.2 MB">
-<!ENTITY libpipeline-fin-sbu "0.2 SBU">
+<!ENTITY libpipeline-fin-du "10 MB">
+<!ENTITY libpipeline-fin-sbu "1.9 SBU">
 
 <!ENTITY libtool-version "2.4.6">
 <!ENTITY libtool-size "951 KB">
@@ -428,7 +434,7 @@
 <!ENTITY libtool-md5 "1bfb9b923f2c1339b4d2ce1807064aa5">
 <!ENTITY libtool-home "&gnu-software;libtool/">
 <!ENTITY libtool-fin-du "43 MB">
-<!ENTITY libtool-fin-sbu "1.8 SBU">
+<!ENTITY libtool-fin-sbu "1.9 SBU">
 
 <!ENTITY linux-major-version "5">
 <!ENTITY linux-minor-version "6">
@@ -447,17 +453,18 @@
 
 <!ENTITY linux-headers-tmp-du "1 GB">
 <!ENTITY linux-headers-tmp-sbu "0.1 SBU">
+<!-- Removed in this book
 <!ENTITY linux-headers-fin-du "1 GB">
-<!ENTITY linux-headers-fin-sbu "0.1 SBU">
+<!ENTITY linux-headers-fin-sbu "0.1 SBU">-->
 
 <!ENTITY m4-version "1.4.18">
 <!ENTITY m4-size "1,180 KB">
 <!ENTITY m4-url "&gnu;m4/m4-&m4-version;.tar.xz">
 <!ENTITY m4-md5 "730bb15d96fffe47e148d1e09235af82">
 <!ENTITY m4-home "&gnu-software;m4/">
-<!ENTITY m4-tmp-du "20 MB">
-<!ENTITY m4-tmp-sbu "0.2 SBU">
-<!ENTITY m4-fin-du "33 MB">
+<!ENTITY m4-tmp-du "22 MB">
+<!ENTITY m4-tmp-sbu "0.1 SBU">
+<!ENTITY m4-fin-du "31 MB">
 <!ENTITY m4-fin-sbu "0.4 SBU">
 
 <!ENTITY make-version "4.3">
@@ -467,7 +474,7 @@
 <!ENTITY make-home "&gnu-software;make/">
 <!ENTITY make-tmp-du "16 MB">
 <!ENTITY make-tmp-sbu "0.1 SBU">
-<!ENTITY make-fin-du "16 MB">
+<!ENTITY make-fin-du "13 MB">
 <!ENTITY make-fin-sbu "0.5 SBU">
 
 <!ENTITY man-db-version "2.9.2">
@@ -491,7 +498,7 @@
 <!ENTITY meson-url "&github;/mesonbuild/meson/releases/download/&meson-version;/meson-&meson-version;.tar.gz">
 <!ENTITY meson-md5 "6da6600c230d4124a73ca77ffef69cad">
 <!ENTITY meson-home "https://mesonbuild.com">
-<!ENTITY meson-fin-du "31 MB">
+<!ENTITY meson-fin-du "33 MB">
 <!ENTITY meson-fin-sbu "less than 0.1 SBU">
 
 <!ENTITY mpc-version "1.1.0">
@@ -499,7 +506,7 @@
 <!ENTITY mpc-url "https://ftp.gnu.org/gnu/mpc/mpc-&mpc-version;.tar.gz">
 <!ENTITY mpc-md5 "4125404e41e482ec68282a2e687f6c73">
 <!ENTITY mpc-home "http://www.multiprecision.org/">
-<!ENTITY mpc-fin-du "22 MB">
+<!ENTITY mpc-fin-du "21 MB">
 <!ENTITY mpc-fin-sbu "0.3 SBU">
 
 <!ENTITY mpfr-version "4.0.2">
@@ -507,7 +514,7 @@
 <!ENTITY mpfr-url "http://www.mpfr.org/mpfr-&mpfr-version;/mpfr-&mpfr-version;.tar.xz">
 <!ENTITY mpfr-md5 "320fbc4463d4c8cb1e566929d8adc4f8">
 <!ENTITY mpfr-home "https://www.mpfr.org/">
-<!ENTITY mpfr-fin-du "37 MB">
+<!ENTITY mpfr-fin-du "36 MB">
 <!ENTITY mpfr-fin-sbu "0.8 SBU">
 
 <!ENTITY ncurses-version "6.2">
@@ -515,9 +522,9 @@
 <!ENTITY ncurses-url "&gnu;ncurses/ncurses-&ncurses-version;.tar.gz">
 <!ENTITY ncurses-md5 "e812da327b1c2214ac1aed440ea3ae8d">
 <!ENTITY ncurses-home "&gnu-software;ncurses/">
-<!ENTITY ncurses-tmp-du "41 MB">
-<!ENTITY ncurses-tmp-sbu "0.6 SBU">
-<!ENTITY ncurses-fin-du "43 MB">
+<!ENTITY ncurses-tmp-du "48 MB">
+<!ENTITY ncurses-tmp-sbu "0.7 SBU">
+<!ENTITY ncurses-fin-du "32 MB">
 <!ENTITY ncurses-fin-sbu "0.4 SBU">
 
 <!ENTITY ninja-version "1.10.0">
@@ -525,7 +532,7 @@
 <!ENTITY ninja-url "&github;/ninja-build/ninja/archive/v&ninja-version;/ninja-&ninja-version;.tar.gz">
 <!ENTITY ninja-md5 "cf1d964113a171da42a8940e7607e71a">
 <!ENTITY ninja-home "https://ninja-build.org/">
-<!ENTITY ninja-fin-du "89 MB">
+<!ENTITY ninja-fin-du "78 MB">
 <!ENTITY ninja-fin-sbu "0.3 SBU">
 
 <!ENTITY openssl-version "1.1.1g">
@@ -533,8 +540,8 @@
 <!ENTITY openssl-url "https://www.openssl.org/source/openssl-&openssl-version;.tar.gz">
 <!ENTITY openssl-md5 "76766e98997660138cdaf13a187bd234">
 <!ENTITY openssl-home "https://www.openssl.org/">
-<!ENTITY openssl-fin-du "147 MB">
-<!ENTITY openssl-fin-sbu "2.2 SBU">
+<!ENTITY openssl-fin-du "150 MB">
+<!ENTITY openssl-fin-sbu "2.1 SBU">
 
 <!ENTITY patch-version "2.7.6">
 <!ENTITY patch-size "766 KB">
@@ -542,8 +549,8 @@
 <!ENTITY patch-md5 "78ad9937e4caadcba1526ef1853730d5">
 <!ENTITY patch-home "https://savannah.gnu.org/projects/patch/">
 <!ENTITY patch-tmp-du "13 MB">
-<!ENTITY patch-tmp-sbu "0.2 SBU">
-<!ENTITY patch-fin-du "13 MB">
+<!ENTITY patch-tmp-sbu "0.1 SBU">
+<!ENTITY patch-fin-du "12 MB">
 <!ENTITY patch-fin-sbu "0.2 SBU">
 
 <!ENTITY perl-version "5.30.3">
@@ -551,10 +558,10 @@
 <!ENTITY perl-url "https://www.cpan.org/src/5.0/perl-&perl-version;.tar.xz">
 <!ENTITY perl-md5 "0af2ab0f01ec13e37cc13a27de930936">
 <!ENTITY perl-home "https://www.perl.org/">
-<!ENTITY perl-tmp-du "275 MB">
+<!ENTITY perl-tmp-du "261 MB">
 <!ENTITY perl-tmp-sbu "1.5 SBU">
-<!ENTITY perl-fin-du "272 MB">
-<!ENTITY perl-fin-sbu "9.2 SBU">
+<!ENTITY perl-fin-du "240 MB">
+<!ENTITY perl-fin-sbu "8.5 SBU">
 
 <!ENTITY pkgconfig-version "0.29.2">
 <!ENTITY pkgconfig-size "1,970 KB">
@@ -562,14 +569,14 @@
 <!ENTITY pkgconfig-md5 "f6e931e319531b736fadc017f470e68a">
 <!ENTITY pkgconfig-home "https://www.freedesktop.org/wiki/Software/pkg-config">
 <!ENTITY pkgconfig-fin-du "30 MB">
-<!ENTITY pkgconfig-fin-sbu "0.3 SBU">
+<!ENTITY pkgconfig-fin-sbu "0.4 SBU">
 
 <!ENTITY procps-ng-version "3.3.16">
 <!ENTITY procps-ng-size "840 KB">
 <!ENTITY procps-ng-url "https://sourceforge.net/projects/procps-ng/files/Production/procps-ng-&procps-ng-version;.tar.xz">
 <!ENTITY procps-ng-md5 "e8dc8455e573bdc40b8381d572bbb89b">
 <!ENTITY procps-ng-home "https://sourceforge.net/projects/procps-ng">
-<!ENTITY procps-ng-fin-du "17 MB">
+<!ENTITY procps-ng-fin-du "16 MB">
 <!ENTITY procps-ng-fin-sbu "0.1 SBU">
 
 <!ENTITY psmisc-version "23.3">
@@ -577,7 +584,7 @@
 <!ENTITY psmisc-url "https://sourceforge.net/projects/psmisc/files/psmisc/psmisc-&psmisc-version;.tar.xz">
 <!ENTITY psmisc-md5 "573bf80e6b0de86e7f307e310098cf86">
 <!ENTITY psmisc-home "http://psmisc.sourceforge.net/">
-<!ENTITY psmisc-fin-du "4.6 MB">
+<!ENTITY psmisc-fin-du "4.7 MB">
 <!ENTITY psmisc-fin-sbu "less than 0.1 SBU">
 
 <!-- If python minor version changes, updates in python and 
@@ -589,9 +596,9 @@
 <!ENTITY python-url "https://www.python.org/ftp/python/&python-version;/Python-&python-version;.tar.xz">
 <!ENTITY python-md5 "3000cf50aaa413052aef82fd2122ca78">
 <!ENTITY python-home "https://www.python.org/">
-<!ENTITY python-tmp-du "409 MB">
-<!ENTITY python-tmp-sbu "1.3 SBU">
-<!ENTITY python-fin-du "426 MB">
+<!ENTITY python-tmp-du "397 MB">
+<!ENTITY python-tmp-sbu "1.2 SBU">
+<!ENTITY python-fin-du "246 MB">
 <!ENTITY python-fin-sbu "1.2 SBU">
 <!ENTITY python-docs-url "https://www.python.org/ftp/python/doc/&python-version;/python-&python-version;-docs-html.tar.bz2">
 <!ENTITY python-docs-md5 "2568df23eb5ad90aabab4b1e84b99fd9">
@@ -611,16 +618,16 @@
 <!ENTITY sed-md5 "6d906edfdb3202304059233f51f9a71d">
 <!ENTITY sed-home "&gnu-software;sed/">
 <!ENTITY sed-tmp-du "21 MB">
-<!ENTITY sed-tmp-sbu "0.2 SBU">
-<!ENTITY sed-fin-du "34 MB">
-<!ENTITY sed-fin-sbu "0.4 SBU">
+<!ENTITY sed-tmp-sbu "0.1 SBU">
+<!ENTITY sed-fin-du "32 MB">
+<!ENTITY sed-fin-sbu "0.5 SBU">
 
 <!ENTITY shadow-version "4.8.1">
 <!ENTITY shadow-size "1,574 KB">
 <!ENTITY shadow-url "&github;/shadow-maint/shadow/releases/download/&shadow-version;/shadow-&shadow-version;.tar.xz">
 <!ENTITY shadow-md5 "4b05eff8a427cf50e615bda324b5bc45">
 <!ENTITY shadow-home "https://pkg-shadow.alioth.debian.org/"> 
-<!ENTITY shadow-fin-du "46 MB">
+<!ENTITY shadow-fin-du "45 MB">
 <!ENTITY shadow-fin-sbu "0.2 SBU">
 
 <!ENTITY sysklogd-version "1.5.1">
@@ -660,10 +667,10 @@
 <!ENTITY tar-url "&gnu;tar/tar-&tar-version;.tar.xz">
 <!ENTITY tar-md5 "83e38700a80a26e30b2df054e69956e5">
 <!ENTITY tar-home "&gnu-software;tar/">
-<!ENTITY tar-tmp-du "38 MB">
-<!ENTITY tar-tmp-sbu "0.3 SBU">
-<!ENTITY tar-fin-du "45 MB">
-<!ENTITY tar-fin-sbu "2.0 SBU">
+<!ENTITY tar-tmp-du "39 MB">
+<!ENTITY tar-tmp-sbu "0.2 SBU">
+<!ENTITY tar-fin-du "39 MB">
+<!ENTITY tar-fin-sbu "2.5 SBU">
 
 <!ENTITY tcl-version "8.6.10">
 <!ENTITY tcl-major-version "8.6">
@@ -671,7 +678,7 @@
 <!ENTITY tcl-url "https://downloads.sourceforge.net/tcl/tcl&tcl-version;-src.tar.gz">
 <!ENTITY tcl-md5 "97c55573f8520bcab74e21bfd8d0aadc">
 <!ENTITY tcl-home "http://tcl.sourceforge.net/">
-<!ENTITY tcl-tmp-du "72 MB">
+<!ENTITY tcl-tmp-du "76 MB">
 <!ENTITY tcl-tmp-sbu "0.9 SBU">
 
 <!ENTITY texinfo-version "6.7">
@@ -679,9 +686,9 @@
 <!ENTITY texinfo-url "&gnu;texinfo/texinfo-&texinfo-version;.tar.xz">
 <!ENTITY texinfo-md5 "d4c5d8cc84438c5993ec5163a59522a6">
 <!ENTITY texinfo-home "&gnu-software;texinfo/">
-<!ENTITY texinfo-tmp-du "104 MB">
-<!ENTITY texinfo-tmp-sbu "0.2 SBU">
-<!ENTITY texinfo-fin-du "116 MB">
+<!ENTITY texinfo-tmp-du "105 MB">
+<!ENTITY texinfo-tmp-sbu "0.3 SBU">
+<!ENTITY texinfo-fin-du "104 MB">
 <!ENTITY texinfo-fin-sbu "0.7 SBU">
 
 <!ENTITY tzdata-version "2020a">
@@ -702,10 +709,10 @@
 <!ENTITY util-linux-url "&kernel;linux/utils/util-linux/v&util-linux-minor;/util-linux-&util-linux-version;.tar.xz">
 <!ENTITY util-linux-md5 "248a4d0810c9193e0e9a4bb3f26b93d8">
 <!ENTITY util-linux-home "http://freecode.com/projects/util-linux">
-<!ENTITY util-linux-tmp-du "154 MB">
-<!ENTITY util-linux-tmp-sbu "0.9 SBU">
-<!ENTITY util-linux-fin-du "289 MB">
-<!ENTITY util-linux-fin-sbu "1.1 SBU">
+<!ENTITY util-linux-tmp-du "129 MB">
+<!ENTITY util-linux-tmp-sbu "0.7 SBU">
+<!ENTITY util-linux-fin-du "254 MB">
+<!ENTITY util-linux-fin-sbu "1.3 SBU">
 
 <!ENTITY vim-version "8.2.0814">
 <!ENTITY vim-majmin "82">
@@ -715,8 +722,8 @@
 <!ENTITY vim-url "&anduin-sources;/vim-&vim-version;.tar.gz">
 <!ENTITY vim-md5 "02b8b91bd2a9a97879fc60616f4eb767">
 <!ENTITY vim-home "https://www.vim.org">
-<!ENTITY vim-fin-du "202 MB">
-<!ENTITY vim-fin-sbu "1.7 SBU">
+<!ENTITY vim-fin-du "198 MB">
+<!ENTITY vim-fin-sbu "3.0 SBU">
 
 <!ENTITY xml-parser-version "2.46">
 <!ENTITY xml-parser-size "249 KB">
@@ -731,9 +738,9 @@
 <!ENTITY xz-url "https://tukaani.org/xz/xz-&xz-version;.tar.xz">
 <!ENTITY xz-md5 "aa1621ec7013a19abab52a8aff04fe5b">
 <!ENTITY xz-home "https://tukaani.org/xz">
-<!ENTITY xz-tmp-du "18 MB">
-<!ENTITY xz-tmp-sbu "0.2 SBU">
-<!ENTITY xz-fin-du "16 MB">
+<!ENTITY xz-tmp-du "16 MB">
+<!ENTITY xz-tmp-sbu "0.1 SBU">
+<!ENTITY xz-fin-du "15 MB">
 <!ENTITY xz-fin-sbu "0.2 SBU">
 
 <!ENTITY zlib-version "1.2.11">
@@ -750,5 +757,5 @@
 <!ENTITY zstd-md5 "dd0b53631303b8f972dafa6fd34beb0c">
 <!ENTITY zstd-home "https://facebook.github.io/zstd/">
 <!ENTITY zstd-fin-du "16 MB">
-<!ENTITY zstd-fin-sbu "0.7 SBU">
+<!ENTITY zstd-fin-sbu "0.6 SBU">