Index: general.ent
===================================================================
--- general.ent	(revision 287d70c905343e50545274748cca8040e2bcdcfe)
+++ general.ent	(revision ba432fde1c2237e3bb1103d132f5b41db3c854ba)
@@ -4,5 +4,5 @@
 -->
 
-<!ENTITY day          "12">                   <!-- Always 2 digits -->
+<!ENTITY day          "15">                   <!-- Always 2 digits -->
 <!ENTITY month        "11">                   <!-- Always 2 digits -->
 <!ENTITY year         "2010">
@@ -503,6 +503,6 @@
 <!-- dhcp (chapter 14) -->
 <!ENTITY leafnode-version             "1.11.5">
-<!ENTITY openldap-download-version    "stable-20100219">
-<!ENTITY openldap-version             "2.4.21">
+<!ENTITY openldap-download-version    "stable-20100719">
+<!ENTITY openldap-version             "2.4.23">
 <!-- rsync (chaptet 18) -->
 <!-- cvs (chapter 18) -->
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 287d70c905343e50545274748cca8040e2bcdcfe)
+++ introduction/welcome/changelog.xml	(revision ba432fde1c2237e3bb1103d132f5b41db3c854ba)
@@ -41,4 +41,13 @@
 
 -->
+
+    <listitem>
+      <para>November 15th, 2010</para>
+      <itemizedlist>
+        <listitem>
+          <para>[randy] - Updated to OpenLDAP-2.4.23.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
 
     <listitem>
Index: server/other/openldap.xml
===================================================================
--- server/other/openldap.xml	(revision 287d70c905343e50545274748cca8040e2bcdcfe)
+++ server/other/openldap.xml	(revision ba432fde1c2237e3bb1103d132f5b41db3c854ba)
@@ -9,8 +9,8 @@
   <!ENTITY openldap-download-http "http://gd.tuwien.ac.at/infosys/network/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        "e7128c57b2bacd940e8906057c94ff26">
-  <!ENTITY openldap-size          "5.4 MB">
-  <!ENTITY openldap-buildsize     "134 MB">
-  <!ENTITY openldap-time          "1.9 SBU and approximately 30 minutes to run the tests (processor independent)">
+  <!ENTITY openldap-md5sum        "90150b8c0d0192e10b30157e68844ddf">
+  <!ENTITY openldap-size          "5.1 MB">
+  <!ENTITY openldap-buildsize     "139 MB">
+  <!ENTITY openldap-time          "2.0 SBU and approximately 35 minutes to run the tests (processor independent)">
 ]>
 
@@ -57,4 +57,12 @@
     </itemizedlist>
 
+    <bridgehead renderas="sect3">Additional Download</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Required patch: <ulink
+        url="&patch-root;/openldap-&openldap-version;-bdb5-1.patch"/></para>
+      </listitem>
+    </itemizedlist>
+
     <!-- <note>
       <para>The <application>OpenLDAP</application> stable releases are
@@ -79,7 +87,6 @@
     <xref linkend="unixodbc"/>,
     <ulink url="http://www.openslp.org/">OpenSLP</ulink>,
-    <xref linkend="pth"/>, and one of
-    <xref linkend="mysql"/>,
-    <ulink url="http://www.oracle.com/technologies/linux/index.html">Oracle</ulink>, or
+    <xref linkend="pth"/>, and either
+    <xref linkend="mysql"/> or
     <xref linkend="postgresql"/></para>
 
@@ -99,5 +106,6 @@
       then proceed with the remaining commands (no test suite available):</para>
 
-<screen><userinput>./configure --prefix=/usr \
+<screen><userinput>patch -Np1 -i ../openldap-&openldap-version;-bdb5-1.patch &amp;&amp;
+./configure --prefix=/usr \
             --sysconfdir=/etc \
             --disable-debug \
@@ -109,5 +117,6 @@
     running the following commands:</para>
 
-<screen><userinput>./configure --prefix=/usr \
+<screen><userinput>patch -Np1 -i ../openldap-&openldap-version;-bdb5-1.patch &amp;&amp;
+./configure --prefix=/usr \
             --libexecdir=/usr/sbin \
             --sysconfdir=/etc \
@@ -195,5 +204,5 @@
     <para><parameter>--disable-sql</parameter>: This parameter explicitly
     disables the sql backend.  Omit this switch if a SQL server is
-    installed.</para>
+    installed and you are going to use a SQL backend (experimental).</para>
 
     <para><option>--disable-bdb --disable-hdb --with-ldbm-api=gdbm</option>:
