diff --git a/general/genlib/glib2.xml b/general/genlib/glib2.xml
index 9bc206fdf8..c0c76678f1 100644
--- a/general/genlib/glib2.xml
+++ b/general/genlib/glib2.xml
@@ -36,7 +36,7 @@
       event loop, threads, dynamic loading and an object system.
     </para>
 
-    &lfs84_checked;
+    &lfs90_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
diff --git a/general/genlib/gobject-introspection.xml b/general/genlib/gobject-introspection.xml
index 1aa9601c5f..ca1b2ffd82 100644
--- a/general/genlib/gobject-introspection.xml
+++ b/general/genlib/gobject-introspection.xml
@@ -37,7 +37,7 @@
       machine readable format.
     </para>
 
-    &lfs84_checked;
+    &lfs90_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
diff --git a/general/genlib/icu.xml b/general/genlib/icu.xml
index 981c9028e2..70cb3660cc 100644
--- a/general/genlib/icu.xml
+++ b/general/genlib/icu.xml
@@ -38,7 +38,7 @@
       the same results on all platforms.
     </para>
 
-    &lfs84_checked;
+    &lfs90_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
diff --git a/general/genlib/js60.xml b/general/genlib/js60.xml
index 3cfeea175c..ae3596f4d7 100644
--- a/general/genlib/js60.xml
+++ b/general/genlib/js60.xml
@@ -34,7 +34,7 @@
       written in C. This package is present for GJS.
     </para>
 
-    &lfs84_checked;
+    &lfs90_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
diff --git a/general/genlib/libarchive.xml b/general/genlib/libarchive.xml
index a277401e8e..8713674635 100644
--- a/general/genlib/libarchive.xml
+++ b/general/genlib/libarchive.xml
@@ -34,7 +34,7 @@
       interface for reading/writing various compression formats.
     </para>
 
-    &lfs84_checked;
+    &lfs90_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
diff --git a/general/genlib/libtasn1.xml b/general/genlib/libtasn1.xml
index 58d4c4334d..a0128172a3 100644
--- a/general/genlib/libtasn1.xml
+++ b/general/genlib/libtasn1.xml
@@ -34,7 +34,7 @@
       that encodes and decodes DER/BER data following an ASN.1 schema.
     </para>
 
-     &lfs84_checked;
+     &lfs90_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
diff --git a/general/genlib/libuv.xml b/general/genlib/libuv.xml
index 91e70101d6..1c7f0bad7b 100644
--- a/general/genlib/libuv.xml
+++ b/general/genlib/libuv.xml
@@ -34,7 +34,7 @@
       multi-platform support library with a focus on asynchronous I/O.
     </para>
 
-    &lfs84_checked;
+    &lfs90_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
diff --git a/general/genlib/libxml2.xml b/general/genlib/libxml2.xml
index 8e893d59a7..8436f19bbd 100644
--- a/general/genlib/libxml2.xml
+++ b/general/genlib/libxml2.xml
@@ -36,7 +36,7 @@
       and utilities used for parsing XML files.
     </para>
 
-    &lfs84_checked;
+    &lfs90_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
diff --git a/general/genlib/libxslt.xml b/general/genlib/libxslt.xml
index 57d7da242a..6a58f276f0 100644
--- a/general/genlib/libxslt.xml
+++ b/general/genlib/libxslt.xml
@@ -36,7 +36,7 @@
       support XSLT files.
     </para>
 
-    &lfs84_checked;
+    &lfs90_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
diff --git a/general/genlib/mtdev.xml b/general/genlib/mtdev.xml
index 21680b9520..8c8378c82c 100644
--- a/general/genlib/mtdev.xml
+++ b/general/genlib/mtdev.xml
@@ -36,7 +36,7 @@
       protocol.
     </para>
 
-    &lfs84_checked;
+    &lfs90_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
diff --git a/general/genlib/nspr.xml b/general/genlib/nspr.xml
index 3fcebbbc9a..beb67ef0c7 100644
--- a/general/genlib/nspr.xml
+++ b/general/genlib/nspr.xml
@@ -34,7 +34,7 @@
       platform-neutral API for system level and libc like functions.
     </para>
 
-    &lfs84_checked;
+    &lfs90_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
diff --git a/general/genlib/pcre.xml b/general/genlib/pcre.xml
index 7abfc5364a..213a779bc4 100644
--- a/general/genlib/pcre.xml
+++ b/general/genlib/pcre.xml
@@ -37,7 +37,7 @@
       <application>Perl</application> 5.
     </para>
 
-    &lfs84_checked;
+    &lfs90_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
diff --git a/general/genlib/wayland-protocols.xml b/general/genlib/wayland-protocols.xml
index 43e49f2e63..2985f29c8c 100644
--- a/general/genlib/wayland-protocols.xml
+++ b/general/genlib/wayland-protocols.xml
@@ -35,7 +35,7 @@
       protocols already in the Wayland core.
     </para>
 
-    &lfs84_checked;
+    &lfs90_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
diff --git a/general/genlib/wayland.xml b/general/genlib/wayland.xml
index 869e9da4d5..f719a0c99d 100644
--- a/general/genlib/wayland.xml
+++ b/general/genlib/wayland.xml
@@ -35,7 +35,7 @@
       implementation of the protocol.
     </para>
 
-    &lfs84_checked;
+    &lfs90_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
diff --git a/general/graphlib/fontconfig.xml b/general/graphlib/fontconfig.xml
index 6c0f26188c..184da19c98 100644
--- a/general/graphlib/fontconfig.xml
+++ b/general/graphlib/fontconfig.xml
@@ -36,7 +36,7 @@
       customizing font access.
     </para>
 
-    &lfs84_checked;
+    &lfs90_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
diff --git a/general/graphlib/freetype2.xml b/general/graphlib/freetype2.xml
index d2eed41891..450896fb7c 100644
--- a/general/graphlib/freetype2.xml
+++ b/general/graphlib/freetype2.xml
@@ -41,7 +41,7 @@
       <application>TrueType</application> fonts.
     </para>
 
-    &lfs84_checked;
+    &lfs90_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
diff --git a/general/graphlib/graphite2.xml b/general/graphlib/graphite2.xml
index 3182df7c4d..9e77b5f385 100644
--- a/general/graphlib/graphite2.xml
+++ b/general/graphlib/graphite2.xml
@@ -43,7 +43,7 @@
       graphite fonts.
     </para>
 
-    &lfs84_checked;
+    &lfs90_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
diff --git a/general/graphlib/harfbuzz.xml b/general/graphlib/harfbuzz.xml
index 7c0004b387..6ebb13f35d 100644
--- a/general/graphlib/harfbuzz.xml
+++ b/general/graphlib/harfbuzz.xml
@@ -35,7 +35,7 @@
       shaping engine.
     </para>
 
-    &lfs84_checked;
+    &lfs90_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
diff --git a/general/graphlib/libpng.xml b/general/graphlib/libpng.xml
index dc1dbb7248..0fedf97a24 100644
--- a/general/graphlib/libpng.xml
+++ b/general/graphlib/libpng.xml
@@ -42,7 +42,7 @@
       with many improvements and extensions and lack of patent problems.
     </para>
 
-    &lfs84_checked;
+    &lfs90_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
diff --git a/general/graphlib/pixman.xml b/general/graphlib/pixman.xml
index 170881e250..54f991a9c5 100644
--- a/general/graphlib/pixman.xml
+++ b/general/graphlib/pixman.xml
@@ -35,7 +35,7 @@
       compositing and trapezoid rasterization.
     </para>
 
-    &lfs84_checked;
+    &lfs90_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
diff --git a/general/prog/autoconf213.xml b/general/prog/autoconf213.xml
index c7538b376d..8dacc52544 100644
--- a/general/prog/autoconf213.xml
+++ b/general/prog/autoconf213.xml
@@ -38,7 +38,7 @@
       required even if configure files have not been changed.
     </para>
 
-    &lfs84_checked;
+    &lfs90_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
diff --git a/general/prog/cmake.xml b/general/prog/cmake.xml
index a49b1c1c00..76e999fbf8 100644
--- a/general/prog/cmake.xml
+++ b/general/prog/cmake.xml
@@ -38,7 +38,7 @@
       since version 4.
     </para>
 
-    &lfs84_checked;
+    &lfs90_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
diff --git a/general/prog/llvm.xml b/general/prog/llvm.xml
index 27ad11dfd7..9c65ba43f5 100644
--- a/general/prog/llvm.xml
+++ b/general/prog/llvm.xml
@@ -59,7 +59,7 @@
       <application>firefox</application>.
     </para>
 
-    &lfs84_checked;
+    &lfs90_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
diff --git a/general/prog/mako.xml b/general/prog/mako.xml
index 89b26375dc..3f00830e20 100644
--- a/general/prog/mako.xml
+++ b/general/prog/mako.xml
@@ -30,7 +30,7 @@
         <application>Python</application> platform.
       </para>
 
-      &lfs84_checked;
+      &lfs90_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
       <itemizedlist spacing="compact">
diff --git a/general/prog/markupsafe.xml b/general/prog/markupsafe.xml
index 2614e1d886..db62c64819 100644
--- a/general/prog/markupsafe.xml
+++ b/general/prog/markupsafe.xml
@@ -29,7 +29,7 @@
         module that implements a XML/HTML/XHTML Markup safe string.
       </para>
 
-      &lfs84_checked;
+      &lfs90_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
       <itemizedlist spacing="compact">
diff --git a/general/prog/python2.xml b/general/prog/python2.xml
index fd3ff68349..685f147fa8 100644
--- a/general/prog/python2.xml
+++ b/general/prog/python2.xml
@@ -55,7 +55,7 @@
     </note>
 
 
-    &lfs84_checked;
+    &lfs90_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
diff --git a/general/sysutils/dbus.xml b/general/sysutils/dbus.xml
index 10a6ba8cc1..c9bd893c6b 100644
--- a/general/sysutils/dbus.xml
+++ b/general/sysutils/dbus.xml
@@ -48,7 +48,7 @@
       their dependencies didn't fit into LFS.
     </para>
 
-    &lfs84_checked;
+    &lfs90_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
diff --git a/general/sysutils/elogind.xml b/general/sysutils/elogind.xml
index d18de33cf4..829dd4989c 100644
--- a/general/sysutils/elogind.xml
+++ b/general/sysutils/elogind.xml
@@ -41,7 +41,7 @@
       <filename class="directory">/run/systemd</filename> layout.
     </para>
 
-    &lfs84_checked;
+    &lfs90_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
diff --git a/general/sysutils/unzip.xml b/general/sysutils/unzip.xml
index a2db335532..b72674ae40 100644
--- a/general/sysutils/unzip.xml
+++ b/general/sysutils/unzip.xml
@@ -36,7 +36,7 @@
     <application>PKZIP</application> or <application>Info-ZIP</application>
     utilities, primarily in a DOS environment.</para>
 
-    &lfs84_checked;
+    &lfs90_checked;
 
     <caution>
       <para>The previous version of the <application>UnZip</application>
diff --git a/general/sysutils/which.xml b/general/sysutils/which.xml
index fa7c29de11..3ff9c1391f 100644
--- a/general/sysutils/which.xml
+++ b/general/sysutils/which.xml
@@ -46,7 +46,7 @@
       <application>which</application> package.
     </para>
 
-    &lfs84_checked;
+    &lfs90_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
diff --git a/general/sysutils/zip.xml b/general/sysutils/zip.xml
index f399ebb922..d7829d4a43 100644
--- a/general/sysutils/zip.xml
+++ b/general/sysutils/zip.xml
@@ -34,7 +34,7 @@
     are useful for compressing files into <filename>ZIP</filename>
     archives.</para>
 
-    &lfs84_checked;
+    &lfs90_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
diff --git a/networking/netlibs/curl.xml b/networking/netlibs/curl.xml
index cbb042f7d8..de884f0f47 100644
--- a/networking/netlibs/curl.xml
+++ b/networking/netlibs/curl.xml
@@ -38,7 +38,7 @@
       functions like streaming media.
     </para>
 
-    &lfs84_checked;
+    &lfs90_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
diff --git a/networking/netprogs/wget.xml b/networking/netprogs/wget.xml
index da15e0162b..e1d513f93d 100644
--- a/networking/netprogs/wget.xml
+++ b/networking/netprogs/wget.xml
@@ -36,7 +36,7 @@
       non-interactive downloading of files from the Web.
     </para>
 
-    &lfs84_checked;
+    &lfs90_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
diff --git a/postlfs/security/cracklib.xml b/postlfs/security/cracklib.xml
index 8d23fa533b..b5d3689813 100644
--- a/postlfs/security/cracklib.xml
+++ b/postlfs/security/cracklib.xml
@@ -39,7 +39,7 @@
     library used to enforce strong passwords by comparing user selected
     passwords to words in chosen word lists.</para>
 
-    &lfs84_checked;
+    &lfs90_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
diff --git a/postlfs/security/linux-pam.xml b/postlfs/security/linux-pam.xml
index 98fea7a742..34738e87cb 100644
--- a/postlfs/security/linux-pam.xml
+++ b/postlfs/security/linux-pam.xml
@@ -43,7 +43,7 @@
       users.
     </para>
 
-    &lfs84_checked;
+    &lfs90_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
diff --git a/postlfs/security/make-ca.xml b/postlfs/security/make-ca.xml
index da4067c6df..b00f888f31 100644
--- a/postlfs/security/make-ca.xml
+++ b/postlfs/security/make-ca.xml
@@ -52,7 +52,7 @@
         url="https://www.mozilla.org/en-US/about/governance/policies/security-group/certs/">here</ulink>.
     </para>
 
-  &lfs84_checked;
+  &lfs90_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
@@ -137,8 +137,7 @@ install -vdm755 /etc/ssl/local</userinput></screen>
     that references this file, create a compatibility symlink for the old
     location as the <systemitem class="username">root</systemitem> user:</para>
 
-<screen role="nodump"><userinput>ln -sfv /etc/pki/tls/certs/ca-bundle.crt \
-        /etc/ssl/ca-bundle.crt</userinput></screen>
+<screen role="nodump"><userinput>ln -sfv /etc/pki/tls/certs/ca-bundle.crt /etc/ssl/ca-bundle.crt</userinput></screen>
 
     <para>You should periodically update the store with the above command,
     either manually, or via a <phrase revision="sysv">cron job.</phrase>
diff --git a/postlfs/security/p11-kit.xml b/postlfs/security/p11-kit.xml
index 16717a2a8f..5303a724d0 100644
--- a/postlfs/security/p11-kit.xml
+++ b/postlfs/security/p11-kit.xml
@@ -34,7 +34,7 @@
       enumerate PKCS #11 (a Cryptographic Token Interface Standard) modules.
     </para>
 
-    &lfs84_checked;
+    &lfs90_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
diff --git a/postlfs/security/polkit.xml b/postlfs/security/polkit.xml
index 030b6f89ae..1b1efac923 100644
--- a/postlfs/security/polkit.xml
+++ b/postlfs/security/polkit.xml
@@ -36,7 +36,7 @@
       communicate with privileged processes.
     </para>
 
-    &lfs84_checked;
+    &lfs90_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
diff --git a/postlfs/security/shadow.xml b/postlfs/security/shadow.xml
index 7610e07e6c..2215906064 100644
--- a/postlfs/security/shadow.xml
+++ b/postlfs/security/shadow.xml
@@ -41,7 +41,7 @@
       <command>login</command> and <command>su</command> to utilize PAM.
     </para>
 
-    &lfs84_checked;
+    &lfs90_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
diff --git a/pst/sgml/sgml-common.xml b/pst/sgml/sgml-common.xml
index 2f9e738fdb..076aca0ad1 100644
--- a/pst/sgml/sgml-common.xml
+++ b/pst/sgml/sgml-common.xml
@@ -33,7 +33,7 @@
     <command>install-catalog</command>. This is useful for creating and
     maintaining centralized SGML catalogs.</para>
 
-    &lfs84_checked;
+    &lfs90_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
diff --git a/pst/xml/docbook-xsl.xml b/pst/xml/docbook-xsl.xml
index 2c23d20512..b6e87e486e 100644
--- a/pst/xml/docbook-xsl.xml
+++ b/pst/xml/docbook-xsl.xml
@@ -41,7 +41,7 @@ xreflabel="docbook-xsl-&docbook-xsl-version;">
     package contains XSL stylesheets. These are useful for
     performing transformations on XML DocBook files.</para>
 
-    &lfs84_checked;
+    &lfs90_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
diff --git a/pst/xml/docbook.xml b/pst/xml/docbook.xml
index ba40514f09..77c863a981 100644
--- a/pst/xml/docbook.xml
+++ b/pst/xml/docbook.xml
@@ -35,7 +35,7 @@
     and software documentation to a standard allowing you to utilize
     transformations already written for that standard.</para>
 
-    &lfs84_checked;
+    &lfs90_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
diff --git a/x/installing/libXau.xml b/x/installing/libXau.xml
index 76616d3e8d..b0ceb93e77 100644
--- a/x/installing/libXau.xml
+++ b/x/installing/libXau.xml
@@ -33,7 +33,7 @@
     implementing the X11 Authorization Protocol. This is useful for
     restricting client access to the display.</para>
 
-    &lfs84_checked;
+    &lfs90_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
diff --git a/x/installing/libXdmcp.xml b/x/installing/libXdmcp.xml
index a15520494a..51bd11bf30 100644
--- a/x/installing/libXdmcp.xml
+++ b/x/installing/libXdmcp.xml
@@ -33,7 +33,7 @@
     implementing the X Display Manager Control Protocol. This is useful for
     allowing clients to interact with the X Display Manager.</para>
 
-    &lfs84_checked;
+    &lfs90_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
diff --git a/x/installing/libevdev.xml b/x/installing/libevdev.xml
index 99e9ce98df..a9e2d84baa 100644
--- a/x/installing/libevdev.xml
+++ b/x/installing/libevdev.xml
@@ -36,7 +36,7 @@
         functions for Xorg input drivers.
       </para>
 
-      &lfs84_checked;
+      &lfs90_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
       <itemizedlist spacing="compact">
diff --git a/x/installing/libinput.xml b/x/installing/libinput.xml
index fa55f7d022..a119950ca3 100644
--- a/x/installing/libinput.xml
+++ b/x/installing/libinput.xml
@@ -37,7 +37,7 @@
       need to directly deal with input devices.
     </para>
 
-    &lfs84_checked;
+    &lfs90_checked;
 
     <bridgehead renderas="sect4">Package Information</bridgehead>
     <itemizedlist spacing="compact">
diff --git a/x/installing/libva.xml b/x/installing/libva.xml
index 331f9b42fc..edc58f4acb 100644
--- a/x/installing/libva.xml
+++ b/x/installing/libva.xml
@@ -49,7 +49,7 @@
        subpicture blending, and rendering.
     </para>
 
-    &lfs84_checked;
+    &lfs90_checked;
 
     <bridgehead renderas="sect4">Package Information</bridgehead>
     <itemizedlist spacing="compact">
diff --git a/x/installing/libvdpau.xml b/x/installing/libvdpau.xml
index 14db7cfffb..724cda866d 100644
--- a/x/installing/libvdpau.xml
+++ b/x/installing/libvdpau.xml
@@ -55,7 +55,7 @@
       required.
     </para>
 
-    &lfs84_checked;
+    &lfs90_checked;
 
     <bridgehead renderas="sect4">Package Information</bridgehead>
     <itemizedlist spacing="compact">
diff --git a/x/installing/libxcb.xml b/x/installing/libxcb.xml
index 27a9ba422f..97a2168e51 100644
--- a/x/installing/libxcb.xml
+++ b/x/installing/libxcb.xml
@@ -34,7 +34,7 @@
     Xlib can also use XCB as a transport layer, allowing software to make
     requests and receive responses with both.</para>
 
-    &lfs84_checked;
+    &lfs90_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
diff --git a/x/installing/mesa.xml b/x/installing/mesa.xml
index 92951e3011..efd91ba5b6 100644
--- a/x/installing/mesa.xml
+++ b/x/installing/mesa.xml
@@ -41,7 +41,7 @@
       </para>
     </note>
 
-    &lfs84_checked;
+    &lfs90_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
diff --git a/x/installing/twm.xml b/x/installing/twm.xml
index fb5761bf6e..3de8ddbd82 100644
--- a/x/installing/twm.xml
+++ b/x/installing/twm.xml
@@ -34,7 +34,7 @@
 
     &not-katamari;
 
-    &lfs84_checked;
+    &lfs90_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
diff --git a/x/installing/util-macros.xml b/x/installing/util-macros.xml
index eb1149c913..34693a2cc4 100644
--- a/x/installing/util-macros.xml
+++ b/x/installing/util-macros.xml
@@ -33,7 +33,7 @@
     <application>m4</application> macros used by all of the
     <application>Xorg</application> packages.</para>
 
-    &lfs84_checked;
+    &lfs90_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
diff --git a/x/installing/x7app.xml b/x/installing/x7app.xml
index 05158be595..f5c34a1ed0 100644
--- a/x/installing/x7app.xml
+++ b/x/installing/x7app.xml
@@ -147,7 +147,7 @@
     expected applications available in previous X Window
     implementations.</para>
 
-    &lfs84_checked;
+    &lfs90_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
diff --git a/x/installing/x7driver-evdev.xml b/x/installing/x7driver-evdev.xml
index fbfc069d56..3c059c70ed 100644
--- a/x/installing/x7driver-evdev.xml
+++ b/x/installing/x7driver-evdev.xml
@@ -38,7 +38,7 @@
         additional drivers are required.
       </para>
 
-      &lfs84_checked;
+      &lfs90_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
       <itemizedlist spacing="compact">
diff --git a/x/installing/x7driver-fbdev.xml b/x/installing/x7driver-fbdev.xml
index 3abe742773..c9c7d0655e 100644
--- a/x/installing/x7driver-fbdev.xml
+++ b/x/installing/x7driver-fbdev.xml
@@ -40,7 +40,7 @@
         well.
       </para>
 
-      &lfs84_checked;
+      &lfs90_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
       <itemizedlist spacing="compact">
diff --git a/x/installing/x7driver-libinput.xml b/x/installing/x7driver-libinput.xml
index 6c455ebd75..acda522fe3 100644
--- a/x/installing/x7driver-libinput.xml
+++ b/x/installing/x7driver-libinput.xml
@@ -38,7 +38,7 @@
         synaptics. 
       </para>
 
-      &lfs84_checked;
+      &lfs90_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
       <itemizedlist spacing="compact">
diff --git a/x/installing/x7driver-nouveau.xml b/x/installing/x7driver-nouveau.xml
index ac7e878ca4..f093f5f11c 100644
--- a/x/installing/x7driver-nouveau.xml
+++ b/x/installing/x7driver-nouveau.xml
@@ -42,7 +42,7 @@
       <note><para>This is a development version of the Nouveau driver
       which is needed to build properly with the latest xorg-server.</para></note>
 
-      &lfs84_checked;
+      &lfs90_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
       <itemizedlist spacing="compact">
diff --git a/x/installing/x7font.xml b/x/installing/x7font.xml
index 326c7272be..2a4293dca9 100644
--- a/x/installing/x7font.xml
+++ b/x/installing/x7font.xml
@@ -62,7 +62,7 @@
     addition to, or instead of, these. Some are listed at <xref
     linkend="TTF-and-OTF-fonts"/>.</para>
 
-    &lfs84_checked;
+    &lfs90_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
diff --git a/x/installing/x7legacy.xml b/x/installing/x7legacy.xml
index ed7a0dc84d..70196cf69d 100644
--- a/x/installing/x7legacy.xml
+++ b/x/installing/x7legacy.xml
@@ -80,7 +80,7 @@
       </para>
     </note>
 
-    &lfs84_checked;
+    &lfs90_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
@@ -157,9 +157,9 @@ do
   packagedir=${package%.tar.bz2}
   tar -xf $package
   pushd $packagedir
-  ./configure $XORG_CONFIG
-  make
-  as_root make install
+    ./configure $XORG_CONFIG
+    make
+    as_root make install
   popd
   rm -rf $packagedir
   as_root /sbin/ldconfig
diff --git a/x/installing/x7lib.xml b/x/installing/x7lib.xml
index 90a9c972d2..3c8382a43d 100644
--- a/x/installing/x7lib.xml
+++ b/x/installing/x7lib.xml
@@ -127,7 +127,7 @@
     <para>The <application>Xorg</application> libraries provide library
     routines that are used within all X Window applications.</para>
 
-    &lfs84_checked;
+    &lfs90_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
diff --git a/x/installing/xbitmaps.xml b/x/installing/xbitmaps.xml
index 44017234e9..23822bfe65 100644
--- a/x/installing/xbitmaps.xml
+++ b/x/installing/xbitmaps.xml
@@ -34,7 +34,7 @@
       images used by multiple applications built in Xorg chapter.
     </para>
 
-    &lfs84_checked;
+    &lfs90_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
diff --git a/x/installing/xcb-proto.xml b/x/installing/xcb-proto.xml
index 1860676071..45f9572aa3 100644
--- a/x/installing/xcb-proto.xml
+++ b/x/installing/xcb-proto.xml
@@ -33,7 +33,7 @@
     XML-XCB protocol descriptions that <application>libxcb</application>
     uses to generate the majority of its code and API.</para>
 
-    &lfs84_checked;
+    &lfs90_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
diff --git a/x/installing/xcb-util-cursor.xml b/x/installing/xcb-util-cursor.xml
index bc74159aaa..b4228e9a45 100644
--- a/x/installing/xcb-util-cursor.xml
+++ b/x/installing/xcb-util-cursor.xml
@@ -35,7 +35,7 @@
       <application>XCB</application> replacement for libXcursor.
     </para>
 
-    &lfs84_checked;
+    &lfs90_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
diff --git a/x/installing/xcb-util-image.xml b/x/installing/xcb-util-image.xml
index da1b14a04e..96b5103b74 100644
--- a/x/installing/xcb-util-image.xml
+++ b/x/installing/xcb-util-image.xml
@@ -34,7 +34,7 @@
       extensions to the <application>XCB</application> library.
     </para>
 
-    &lfs84_checked;
+    &lfs90_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
diff --git a/x/installing/xcb-util-keysyms.xml b/x/installing/xcb-util-keysyms.xml
index 83238b72bf..d15a40c8e2 100644
--- a/x/installing/xcb-util-keysyms.xml
+++ b/x/installing/xcb-util-keysyms.xml
@@ -35,7 +35,7 @@
       for handling standard X key constants and conversion to/from keycodes.
     </para>
 
-    &lfs84_checked;
+    &lfs90_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
diff --git a/x/installing/xcb-util-renderutil.xml b/x/installing/xcb-util-renderutil.xml
index 2e887e3534..4d42654b29 100644
--- a/x/installing/xcb-util-renderutil.xml
+++ b/x/installing/xcb-util-renderutil.xml
@@ -34,7 +34,7 @@
       extensions to the <application>XCB</application> library.
     </para>
 
-    &lfs84_checked;
+    &lfs90_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
diff --git a/x/installing/xcb-util-wm.xml b/x/installing/xcb-util-wm.xml
index f345469ead..581a946061 100644
--- a/x/installing/xcb-util-wm.xml
+++ b/x/installing/xcb-util-wm.xml
@@ -35,7 +35,7 @@
       which provide client and window-manager helpers for EWMH and ICCCM.
     </para>
 
-    &lfs84_checked;
+    &lfs90_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
diff --git a/x/installing/xcb-util.xml b/x/installing/xcb-util.xml
index 5011a542fc..fc2497f035 100644
--- a/x/installing/xcb-util.xml
+++ b/x/installing/xcb-util.xml
@@ -36,7 +36,7 @@
       core X protocol.
     </para>
 
-    &lfs84_checked;
+    &lfs90_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
diff --git a/x/installing/xclock.xml b/x/installing/xclock.xml
index 1134ce7ec0..a6a285cb86 100644
--- a/x/installing/xclock.xml
+++ b/x/installing/xclock.xml
@@ -34,7 +34,7 @@
 
     &not-katamari;
 
-    &lfs84_checked;
+    &lfs90_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
diff --git a/x/installing/xcursor-themes.xml b/x/installing/xcursor-themes.xml
index 745558195b..06acf4eb56 100644
--- a/x/installing/xcursor-themes.xml
+++ b/x/installing/xcursor-themes.xml
@@ -34,7 +34,7 @@
       redglass and whiteglass animated cursor themes.
     </para>
 
-    &lfs84_checked;
+    &lfs90_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
diff --git a/x/installing/xinit.xml b/x/installing/xinit.xml
index 9ff4485dd4..331ef2646f 100644
--- a/x/installing/xinit.xml
+++ b/x/installing/xinit.xml
@@ -34,7 +34,7 @@
 
     &not-katamari;
 
-    &lfs84_checked;
+    &lfs90_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
diff --git a/x/installing/xkeyboard-config.xml b/x/installing/xkeyboard-config.xml
index 19ea331bbb..f34bab4d1c 100644
--- a/x/installing/xkeyboard-config.xml
+++ b/x/installing/xkeyboard-config.xml
@@ -36,7 +36,7 @@
       the keyboard configuration database for the X Window System.
     </para>
 
-    &lfs84_checked;
+    &lfs90_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
diff --git a/x/installing/xorg-config.xml b/x/installing/xorg-config.xml
index 612f2aa8c9..1b13b11b83 100644
--- a/x/installing/xorg-config.xml
+++ b/x/installing/xorg-config.xml
@@ -44,9 +44,9 @@
       <para>
         When testing <application>Xorg</application> with the
         <application>twm</application> window manager, there will be several
-        warnings in the Xorg log file, <filename revision="sysv">
-        /var/log/Xorg.0.log</filename><filename revision="systemd">
-        $HOME/.local/share/xorg/Xorg.0.log</filename>, about missing font
+        warnings in the Xorg log file, <!--<filename revision="sysv">
+        /var/log/Xorg.0.log</filename><filename revision="systemd">-->
+        $HOME/.local/share/xorg/Xorg.0.log<!--</filename>-->, about missing font
         files. In addition, there will be several warnings on the text mode
         terminal (usually tty1) about missing fonts. These warnings do not
         affect functionality, but can be removed if desired by installing
diff --git a/x/installing/xorg-server.xml b/x/installing/xorg-server.xml
index 51f7cb734c..1e22213708 100644
--- a/x/installing/xorg-server.xml
+++ b/x/installing/xorg-server.xml
@@ -34,7 +34,7 @@
       of the X Window system.
     </para>
 
-    &lfs84_checked;
+    &lfs90_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
diff --git a/x/installing/xorgproto.xml b/x/installing/xorgproto.xml
index 360662f39e..eebed7a8f6 100644
--- a/x/installing/xorgproto.xml
+++ b/x/installing/xorgproto.xml
@@ -33,7 +33,7 @@
     header files required to build the X Window system, and to allow other
     applications to build against the installed X Window system.</para>
 
-    &lfs84_checked;
+    &lfs90_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
diff --git a/x/installing/xterm.xml b/x/installing/xterm.xml
index ce148a1ed8..4d958b5596 100644
--- a/x/installing/xterm.xml
+++ b/x/installing/xterm.xml
@@ -35,7 +35,7 @@
 
     &not-katamari;
 
-    &lfs84_checked;
+    &lfs90_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
diff --git a/x/lib/libdrm.xml b/x/lib/libdrm.xml
index bce4ca8aa3..825a2fd384 100644
--- a/x/lib/libdrm.xml
+++ b/x/lib/libdrm.xml
@@ -37,7 +37,7 @@
       similar projects.
     </para>
 
-    &lfs84_checked;
+    &lfs90_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
diff --git a/x/lib/libepoxy.xml b/x/lib/libepoxy.xml
index d0b89a5f1a..ef4c424eab 100644
--- a/x/lib/libepoxy.xml
+++ b/x/lib/libepoxy.xml
@@ -34,7 +34,7 @@
       function pointer management.
     </para>
 
-    &lfs84_checked;
+    &lfs90_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">