Index: chapter08/check.xml
===================================================================
--- chapter08/check.xml	(revision 032dc4e8e8f9da5556f06dd308757c7882516e1c)
+++ chapter08/check.xml	(revision 4ea78e038fcb8b9b638466ac6fa0600e6890025f)
@@ -43,5 +43,5 @@
     <para>Prepare Check for compilation:</para>
 
-<screen><userinput remap="configure">./configure --prefix=/usr</userinput></screen>
+<screen><userinput remap="configure">./configure --prefix=/usr --disable-static</userinput></screen>
 
     <para>Build the package:</para>
@@ -72,5 +72,5 @@
       <seglistitem>
         <seg>checkmk</seg>
-        <seg>libcheck.{a,so}</seg>
+        <seg>libcheck.so</seg>
       </seglistitem>
     </segmentedlist>
Index: chapter08/gcc.xml
===================================================================
--- chapter08/gcc.xml	(revision 032dc4e8e8f9da5556f06dd308757c7882516e1c)
+++ chapter08/gcc.xml	(revision 4ea78e038fcb8b9b638466ac6fa0600e6890025f)
@@ -144,5 +144,5 @@
 
     <para>Additionally the following tests related to the following files
-    are kown to fail with glibc-2.32: asan_test.C, co-ret-17-void-ret-coro.C, 
+    are known to fail with glibc-2.32: asan_test.C, co-ret-17-void-ret-coro.C, 
     pr95519-05-gro.C, pr80166.c.</para>
 
Index: chapter08/kbd.xml
===================================================================
--- chapter08/kbd.xml	(revision 032dc4e8e8f9da5556f06dd308757c7882516e1c)
+++ chapter08/kbd.xml	(revision 4ea78e038fcb8b9b638466ac6fa0600e6890025f)
@@ -88,4 +88,8 @@
 
 <screen><userinput remap="install">make install</userinput></screen>
+
+    <para>Remove an internal library installed unintentionally:</para>
+
+<screen><userinput remap="install">rm -v /usr/lib/libtswrap.{a,la,so*}</userinput></screen>
 
     <note>
Index: chapter08/perl.xml
===================================================================
--- chapter08/perl.xml	(revision 032dc4e8e8f9da5556f06dd308757c7882516e1c)
+++ chapter08/perl.xml	(revision 4ea78e038fcb8b9b638466ac6fa0600e6890025f)
@@ -59,10 +59,10 @@
              -Dprefix=/usr                                \
              -Dvendorprefix=/usr                          \
-             -Dprivlib=/usr/share/perl5/core_perl         \
-             -Darchlib=/usr/lib/perl5/&perl-version-min;/core_perl      \
-             -Dsitelib=/usr/share/perl5/site_perl         \
-             -Dsitearch=/usr/lib/perl5/&perl-version-min;/site_perl     \
+             -Dprivlib=/usr/lib/perl5/5.32/core_perl      \
+             -Darchlib=/usr/lib/perl5/5.32/core_perl      \
+             -Dsitelib=/usr/lib/perl5/5.32/site_perl      \
+             -Dsitearch=/usr/lib/perl5/5.32/site_perl     \
              -Dvendorlib=/usr/share/perl5/vendor_perl     \
-             -Dvendorarch=/usr/lib/perl5/&perl-version-min;/vendor_perl \
+             -Dvendorarch=/usr/lib/perl5/5.32/vendor_perl \
              -Dman1dir=/usr/share/man/man1                \
              -Dman3dir=/usr/share/man/man3                \
Index: chapter08/systemd.xml
===================================================================
--- chapter08/systemd.xml	(revision 032dc4e8e8f9da5556f06dd308757c7882516e1c)
+++ chapter08/systemd.xml	(revision 4ea78e038fcb8b9b638466ac6fa0600e6890025f)
@@ -41,7 +41,9 @@
     <title>Installation of systemd</title>
 
+<!--
     <para>First, apply a patch to fix the build with GCC-10 and fix a segfault:</para>
 
 <screen><userinput remap="pre">patch -Np1 -i ../systemd-&systemd-version;-gcc_10-fixes-2.patch</userinput></screen>
+-->
 
     <para>Create a symlink to work around the xsltproc command not being installed:</para>
@@ -55,5 +57,5 @@
     <para>Remove tests that cannot be built in chroot:</para>
 
-<screen><userinput remap="pre">sed '179,$ d' -i src/resolve/meson.build</userinput></screen>
+<screen><userinput remap="pre">sed '177,$ d' -i src/resolve/meson.build</userinput></screen>
 
     <para>Remove an unneeded group,
@@ -378,6 +380,7 @@
         /etc/sysctl.d, /etc/systemd, /etc/tmpfiles.d, /etc/udev,
         /etc/xdg/systemd, /lib/systemd, /lib/udev, /usr/include/systemd,
-        /usr/lib/binfmt.d, /usr/lib/kernel, /usr/lib/modules-load.d,
-        /usr/lib/sysctl.d, /usr/lib/systemd, /usr/lib/tmpfiles.d,
+        /usr/lib/binfmt.d, /usr/lib/environment.d, /usr/lib/kernel, 
+        /usr/lib/modules-load.d, /usr/lib/sysctl.d, /usr/lib/systemd, 
+        /usr/lib/tmpfiles.d,
         /usr/share/doc/systemd-&systemd-version;, /usr/share/factory,
         /usr/share/systemd, /var/lib/systemd, and /var/log/journal</seg>
