Index: general/genutils/bogofilter.xml
===================================================================
--- general/genutils/bogofilter.xml	(revision 5a9b64a3ac34279b889a33dd322a4b8f0144e687)
+++ general/genutils/bogofilter.xml	(revision b0b2cf3aac508d4bf452d5605ef12e4311f21741)
@@ -5,9 +5,9 @@
   %general-entities;
 
-  <!ENTITY bogofilter-download-http "&sourceforge-dl;/bogofilter/bogofilter-&bogofilter-version;.tar.gz">
+  <!ENTITY bogofilter-download-http "&sourceforge-dl;/bogofilter/bogofilter-&bogofilter-version;.tar.xz">
   <!ENTITY bogofilter-download-ftp  " ">
-  <!ENTITY bogofilter-md5sum        "94aee3ced558c2a354547083735f2ba7">
-  <!ENTITY bogofilter-size          "1.9 MB">
-  <!ENTITY bogofilter-buildsize     "16 MB">
+  <!ENTITY bogofilter-md5sum        "8763f87adfff7b802ced177d8c654539">
+  <!ENTITY bogofilter-size          "784 KB">
+  <!ENTITY bogofilter-buildsize     "19 MB">
   <!ENTITY bogofilter-time          "0.1 SBU">
 ]>
@@ -81,10 +81,13 @@
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
-      <xref linkend="gsl"/>
+      <xref linkend="gsl"/> and
+      <xref linkend="libxml2"/>
     </para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
+      <xref linkend="lmdb"/>,
       <xref linkend="sqlite"/>,
+      <xref linkend="xmlto"/>,
       <ulink url="http://fallabs.com/qdbm/">QDBM</ulink> and
       <ulink url="http://fallabs.com/tokyocabinet/">TokyoCabinet</ulink>
@@ -225,5 +228,5 @@
         <listitem>
           <para>
-            used to separate messages into tokens and to test new
+            is used to separate messages into tokens and to test new
             versions of the lexer.l code.
           </para>
@@ -238,5 +241,5 @@
         <listitem>
           <para>
-            tries to find optimum parameter settings for bogofilter.
+            attempts to find optimum parameter settings for bogofilter.
           </para>
           <indexterm zone="bogofilter bogotune">
@@ -250,5 +253,5 @@
         <listitem>
           <para>
-            upgrades bogofilter database to current version.
+            upgrades the bogofilter database to the current version.
           </para>
           <indexterm zone="bogofilter bogoupgrade">
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 5a9b64a3ac34279b889a33dd322a4b8f0144e687)
+++ introduction/welcome/changelog.xml	(revision b0b2cf3aac508d4bf452d5605ef12e4311f21741)
@@ -46,4 +46,12 @@
       <itemizedlist>
         <listitem>
+          <para>[renodr] - Update to bogofilter-1.2.5. Fixes
+          <ulink url="&blfs-ticket-root;12552">#12552</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to NSS-3.47. Fixes
+          <ulink url="&blfs-ticket-root;12674">#12674</ulink>.</para>
+        </listitem>
+        <listitem>
           <para>[renodr] - Update to libuv-1.33.1. Fixes
           <ulink url="&blfs-ticket-root;12668">#12668</ulink>.</para>
Index: packages.ent
===================================================================
--- packages.ent	(revision 5a9b64a3ac34279b889a33dd322a4b8f0144e687)
+++ packages.ent	(revision b0b2cf3aac508d4bf452d5605ef12e4311f21741)
@@ -26,8 +26,8 @@
 <!ENTITY nettle-version               "3.5.1">
 
-<!ENTITY nss-minor-version            "46">
-<!ENTITY nss-micro-version            "1">
-<!ENTITY nss-version                  "3.&nss-minor-version;.&nss-micro-version;">
-<!--<!ENTITY nss-version                  "3.&nss-minor-version;">-->
+<!ENTITY nss-minor-version            "47">
+<!--<!ENTITY nss-micro-version            "1">-->
+<!--<!ENTITY nss-version                  "3.&nss-minor-version;.&nss-micro-version;">-->
+<!ENTITY nss-version                  "3.&nss-minor-version;">
 <!ENTITY openssh-version              "8.1p1">
 <!-- <!ENTITY openssl-version              "1.1.0g"> -->
@@ -228,5 +228,5 @@
 <!-- Chapter 11 -->
 <!ENTITY asciidoc-version             "8.6.9">
-<!ENTITY bogofilter-version           "1.2.4">
+<!ENTITY bogofilter-version           "1.2.5">
 <!ENTITY chrpath-version              "0.16">
 <!ENTITY compface-version             "1.5.2">
Index: postlfs/security/nss.xml
===================================================================
--- postlfs/security/nss.xml	(revision 5a9b64a3ac34279b889a33dd322a4b8f0144e687)
+++ postlfs/security/nss.xml	(revision b0b2cf3aac508d4bf452d5605ef12e4311f21741)
@@ -9,15 +9,15 @@
 
 <!-- micro versions -->
-<!ENTITY nss-download-http "https://&nss-url;/NSS_3_&nss-minor-version;_&nss-micro-version;_RTM/src/nss-&nss-version;.tar.gz">
+<!--<!ENTITY nss-download-http "https://&nss-url;/NSS_3_&nss-minor-version;_&nss-micro-version;_RTM/src/nss-&nss-version;.tar.gz">-->
 
 <!-- no micro versions -->
-<!--<!ENTITY nss-download-http "https://&nss-url;/NSS_3_&nss-minor-version;_RTM/src/nss-&nss-version;.tar.gz">-->
+<!ENTITY nss-download-http "https://&nss-url;/NSS_3_&nss-minor-version;_RTM/src/nss-&nss-version;.tar.gz">
 
   <!ENTITY nss-download-ftp " ">
-  <!ENTITY nss-md5sum        "e0fe0d828091919746eabba57ca5f155">
+  <!ENTITY nss-md5sum        "81e47f3c70c2c53f801ab39434c887fb">
   <!ENTITY nss-size          "73 MB">
   <!-- 50 MB increase is due to new test files, see #12187 -->
-  <!ENTITY nss-buildsize     "249 MB">
-  <!ENTITY nss-time          "2.7 SBU">
+  <!ENTITY nss-buildsize     "255 MB">
+  <!ENTITY nss-time          "2.0 SBU">
 ]>
 
