Index: general.ent
===================================================================
--- general.ent	(revision b895aa319f6b8e3a762842c88b75f0c00c304342)
+++ general.ent	(revision 45cd2f972c3d3835c4ee1f1859d81aa15f343d68)
@@ -382,5 +382,5 @@
 <!ENTITY courier-version              "0.47">
 <!ENTITY exim-version                 "4.67">
-<!ENTITY postfix-version              "2.3.3">
+<!ENTITY postfix-version              "2.5.1">
 <!ENTITY qpopper-version              "4.0.9">
 <!ENTITY sendmail-version             "8.14.1">
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision b895aa319f6b8e3a762842c88b75f0c00c304342)
+++ introduction/welcome/changelog.xml	(revision 45cd2f972c3d3835c4ee1f1859d81aa15f343d68)
@@ -46,4 +46,7 @@
         <listitem>
           <para>[dj] - Updated to OpenLDAP-2.3.39.</para>
+        </listitem>
+        <listitem>
+          <para>[dj] - Updated to Postfix-2.5.1.</para>
         </listitem>
       </itemizedlist>
Index: server/mail/postfix.xml
===================================================================
--- server/mail/postfix.xml	(revision b895aa319f6b8e3a762842c88b75f0c00c304342)
+++ server/mail/postfix.xml	(revision 45cd2f972c3d3835c4ee1f1859d81aa15f343d68)
@@ -5,10 +5,10 @@
   %general-entities;
 
-  <!ENTITY postfix-download-http "http://www.mirrorspace.org/postfix/official/postfix-&postfix-version;.tar.gz">
+  <!ENTITY postfix-download-http "http://postfix.energybeam.com/source/official/postfix-&postfix-version;.tar.gz">
   <!ENTITY postfix-download-ftp "ftp://ftp.porcupine.org/mirrors/postfix-release/official/postfix-&postfix-version;.tar.gz">
-  <!ENTITY postfix-md5sum "f957e9319428be81c724b606fe060cc7">
-  <!ENTITY postfix-size "2.6 MB">
-  <!ENTITY postfix-buildsize "85 MB">
-  <!ENTITY postfix-time "0.5 SBU">
+  <!ENTITY postfix-md5sum "95a559c509081fdd07d78eafd4f4c3b4">
+  <!ENTITY postfix-size "3 MB">
+  <!ENTITY postfix-buildsize "97 MB">
+  <!ENTITY postfix-time "0.4 SBU">
 ]>
 
@@ -110,15 +110,11 @@
 
       <sect4>
-        <title>TLS Authentication</title>
-
-        <para>To use TLS authentication with postfix
-        you will need to pass the following values to the
-        <command>make makefiles</command> command:</para>
-
-<screen><literal>CCARGS='-DUSE_TLS -I/usr/include/openssl'
-AUXLIBS='-L/usr/lib -lssl -lcrypto'</literal></screen>
-
-        <para>To use TLS you will also need
-        <xref linkend="cyrus-sasl"/>.</para>
+        <title>Perl compatible regular expressions</title>
+
+        <para>To use <application>PCRE</application> with
+        <application>Postfix</application>, use the following arguments:</para>
+
+<screen><literal>CCARGS='-DHAS_PCRE -I/usr/include'
+AUXLIBS='-L/usr/lib -lpcre'</literal></screen>
 
       </sect4>
@@ -132,4 +128,16 @@
 <screen><literal>CCARGS='-DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I/usr/include/sasl'
 AUXLIBS='-L/usr/lib -lsasl2'</literal></screen>
+
+      </sect4>
+
+      <sect4>
+        <title>Berkely DB</title>
+
+        <para>To use <application>Berkely DB</application> with
+        <application>Postfix</application>, use the following
+        arguments:</para>
+
+<screen><literal>CCARGS='-DHAS_DB -I/usr/include'
+AUXLIBS='-L/usr/lib -ldb'</literal></screen>
 
       </sect4>
@@ -142,5 +150,5 @@
         arguments:</para>
 
-<screen><literal>CCARGS='-I/usr/include -DHAS_LDAP'
+<screen><literal>CCARGS='-DHAS_LDAP -I/usr/include'
 AUXLIBS='-L/usr/lib -lldap -llber'</literal></screen>
 
@@ -172,12 +180,25 @@
 
       <sect4>
-        <title>TinyCDB</title>
-
-        <para>To use <application>TinyCDB</application> with
+        <title>CDB/TinyCDB</title>
+
+        <para>To use <application>CDB</application> or
+        <application>TinyCDB</application> with
         <application>Postfix</application>, use the following
         arguments:</para>
 
 <screen><literal>CCARGS='-DHAS_CDB'
-AUXLIBS='<replaceable>&lt;/path/to/CDB&gt;</replaceable>/libcdb.a'</literal></screen>
+AUXLIBS='<replaceable>&lt;/path/to/CDB&gt;</replaceable>/libcdb.a'</literal></screen> 
+
+      </sect4>
+
+      <sect4>
+        <title>StartTLS Authentication</title>
+
+        <para>To use <application>OpenSSL</application> with
+        <application>Postfix</application>, use the following
+        arguments:</para>
+
+<screen><literal>CCARGS='-DUSE_TLS -I/usr/include/openssl/'
+AUXLIBS='-L/usr/lib -lssl -lcrypto'</literal></screen>
 
       </sect4>
