diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index b26dda4dc8..0440b4c6d9 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -44,6 +44,18 @@
     <listitem>
       <para>July 21st, 2022</para>
       <itemizedlist>
+        <listitem>
+          <para>[renodr] - Update to openldap-2.6.3. Fixes
+          <ulink url="&blfs-ticket-root;16812">#16812</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to stunnel-5.65. Fixes
+          <ulink url="&blfs-ticket-root;16815">#16815</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to samba-4.16.3. Fixes
+          <ulink url="&blfs-ticket-root;16816">#16816</ulink>.</para>
+        </listitem>
         <listitem>
           <para>[bdubbs] - Update to libxcvt-0.1.2. Fixes
           <ulink url="&blfs-ticket-root;16819">#16819</ulink>.</para>
diff --git a/networking/netprogs/samba.xml b/networking/netprogs/samba.xml
index 5d8823906f..8e6e76c362 100644
--- a/networking/netprogs/samba.xml
+++ b/networking/netprogs/samba.xml
@@ -6,10 +6,10 @@
 
   <!ENTITY samba-download-http "https://download.samba.org/pub/samba/stable/samba-&samba-version;.tar.gz">
   <!ENTITY samba-download-ftp  " ">
-  <!ENTITY samba-md5sum        "69c4589b4f7418bb1b877519a88a1a5d">
+  <!ENTITY samba-md5sum        "1bb1a955837a59764fe5af7697ef7bbf">
   <!ENTITY samba-size          "29 MB">
-  <!ENTITY samba-buildsize     "618 MB (add 387 MB for quicktest)">
-  <!ENTITY samba-time          "2.9 SBU (using parallelism=4; add 3.5 SBU for quicktest)">
+  <!ENTITY samba-buildsize     "698 MB (add 386 MB for quicktest)">
+  <!ENTITY samba-time          "2.0 SBU (using parallelism=4; add 3.5 SBU for quicktest)">
 ]>
 <!-- [pierre 2021-11-11]: quick test seems to be much smaller than previously.
      I'll update anyway since this is a high priority release: feel free
@@ -132,7 +132,7 @@
       <ulink url="https://cwrap.org/">cwrap</ulink>,
       <ulink url="&pypi;/dnspython/">dnspython</ulink>,
       <ulink url="https://packages.debian.org/stretch/fam">FAM</ulink>,
-      <ulink url="https://people.gnome.org/~veillard/gamin/">Gamin</ulink>,
+      <ulink url="https://packages.debian.org/sid/gamin">Gamin</ulink>,
       <ulink url="https://www.gluster.org/">GlusterFS</ulink>,
       <ulink url="https://github.com/heimdal/">Heimdal</ulink> (included),
       <ulink url="https://pypi.org/project/iso8601/">iso8601</ulink>,
diff --git a/packages.ent b/packages.ent
index ea52d5e2d8..84167644de 100644
--- a/packages.ent
+++ b/packages.ent
@@ -38,7 +38,7 @@
 <!ENTITY polkit-gnome-version         "0.105">
 <!ENTITY shadow-version               "4.11.1">
 <!ENTITY ssh-askpass-version          "&openssh-version;">
-<!ENTITY stunnel-version              "5.64">
+<!ENTITY stunnel-version              "5.65">
 <!ENTITY sudo-version                 "1.9.11p3">
 <!ENTITY tripwire-version             "2.4.3.7">
 <!ENTITY util-linux-minor             "2.37">
@@ -612,7 +612,7 @@ to avoid building libxml2 twice, which is slow with all deps -->
 <!ENTITY ntp-version                  "4.2.8p15">
 <!ENTITY rpcbind-version              "1.2.6">
 <!ENTITY rsync-version                "3.2.4">
-<!ENTITY samba-version                "4.16.2">
+<!ENTITY samba-version                "4.16.3">
 <!ENTITY wget-version                 "1.21.3">
 <!ENTITY wireless-tools-version       "29">
 <!ENTITY wpa_supplicant-version       "2.10">
@@ -704,7 +704,7 @@ to avoid building libxml2 twice, which is slow with all deps -->
 <!ENTITY sqlite-doc-version           "3390100">
 
 <!-- Chapter 23 -->
-<!ENTITY openldap-version             "2.6.2">
+<!ENTITY openldap-version             "2.6.3">
 <!ENTITY soprano-version              "2.9.4">
 <!ENTITY unbound-version              "1.16.1">
 <!ENTITY virtuoso-version             "6.1.8">
diff --git a/postlfs/security/stunnel.xml b/postlfs/security/stunnel.xml
index 7732bdef3b..fcecc67c0c 100644
--- a/postlfs/security/stunnel.xml
+++ b/postlfs/security/stunnel.xml
@@ -9,9 +9,9 @@
   <!ENTITY stunnel-download-ftp  "ftp://ftp.stunnel.org/stunnel/archive/5.x/stunnel-&stunnel-version;.tar.gz">
   <!-- Following ftp only has later release -->
 <!--   "ftp://ftp.stunnel.org/stunnel/stunnel-&stunnel-version;.tar.gz"> -->
-  <!ENTITY stunnel-md5sum        "fc069f84558710a0bdb7cf14110a6aeb">
+  <!ENTITY stunnel-md5sum        "b05d5e07a59eb6c3c0b7d26d1281e5c6">
   <!ENTITY stunnel-size          "852 KB">
-  <!ENTITY stunnel-buildsize     "6.8 MB">
+  <!ENTITY stunnel-buildsize     "8.1 MB">
   <!ENTITY stunnel-time          "0.1 SBU">
 ]>
 
@@ -86,7 +86,7 @@
       <xref linkend="libnsl"/>,
       <ulink url="http://netcat.sourceforge.net/">netcat</ulink>
       (required for tests),
-      <ulink url="ftp://ftp.porcupine.org/pub/security/">tcpwrappers</ulink>,
+      <ulink url="http://ftp.porcupine.org/pub/security/index.html">tcpwrappers</ulink>,
       and
       <ulink url="https://dist.torproject.org/">TOR</ulink>
     </para>
diff --git a/server/other/openldap.xml b/server/other/openldap.xml
index 1cfdbfeb0e..7ed31a91b9 100644
--- a/server/other/openldap.xml
+++ b/server/other/openldap.xml
@@ -6,9 +6,9 @@
 
   <!ENTITY openldap-download-http "https://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-&openldap-version;.tgz">
   <!ENTITY openldap-download-ftp  "ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/openldap-&openldap-version;.tgz">
-  <!ENTITY openldap-md5sum        "464b520cd88eddf10fe63ecd2902146c">
+  <!ENTITY openldap-md5sum        "6b7229396b335dd5ab2d24841d7f4b53">
   <!ENTITY openldap-size          "6.2 MB">
-  <!ENTITY openldap-buildsize     "58 MB (client and server)">
+  <!ENTITY openldap-buildsize     "101 MB (client and server)">
   <!ENTITY openldap-time          "0.4 SBU (client), 0.9 SBU (server)">
 ]>
 
@@ -173,7 +173,6 @@ autoconf &amp;&amp;
             --enable-modules      \
             --enable-rlookups     \
             --enable-backends=mod \
-            --disable-ndb         \
             --disable-sql         \
             --disable-wt          \
             --enable-overlays=mod &amp;&amp;
@@ -261,12 +260,14 @@ cp      -vfr      doc/{drafts,rfc,guide} \
       all available overlays.
     </para>
 
+<!--
     <para>
-      <parameter>--disable-ndb</parameter>: This switch disables
+      <parameter>- -disable-ndb</parameter>: This switch disables
       <application>MySQL</application> NDB Cluster backend
       which causes configure to fail if
       <application>MySQL</application> is present.
     </para>
+-->
 
     <para>
       <parameter>--disable-sql</parameter>: This switch explicitly