Index: general.ent
===================================================================
--- general.ent	(revision 033c86dd2810a075149aad79fb79fe06a84f715b)
+++ general.ent	(revision 50d61edb15007ffdb56c8cbaf980d8e92dd2be34)
@@ -40,5 +40,5 @@
 <!ENTITY mitkrb-version               "1.4">
 <!ENTITY cyrus-sasl-version           "2.1.21">
-<!ENTITY stunnel-version              "4.09">
+<!ENTITY stunnel-version              "4.11">
 
 <!-- Chapter 5 -->
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 033c86dd2810a075149aad79fb79fe06a84f715b)
+++ introduction/welcome/changelog.xml	(revision 50d61edb15007ffdb56c8cbaf980d8e92dd2be34)
@@ -25,4 +25,8 @@
   <itemizedlist>
     
+    <listitem>
+      <para>July 20th 2005 [randy]: Updated to Stunnel-4.11.</para>
+    </listitem>
+
     <listitem>
       <para>July 19th 2005 [randy]: Updated to Doxygen-1.4.3.</para>
Index: postlfs/security/stunnel.xml
===================================================================
--- postlfs/security/stunnel.xml	(revision 033c86dd2810a075149aad79fb79fe06a84f715b)
+++ postlfs/security/stunnel.xml	(revision 50d61edb15007ffdb56c8cbaf980d8e92dd2be34)
@@ -8,8 +8,8 @@
   <!ENTITY stunnel-download-http "http://www.stunnel.org/download/stunnel/src/stunnel-&stunnel-version;.tar.gz">
   <!ENTITY stunnel-download-ftp  "ftp://stunnel.mirt.net/stunnel/stunnel-&stunnel-version;.tar.gz">
-  <!ENTITY stunnel-md5sum        "2077669b04c36e4c0baa68348e8860a7">
+  <!ENTITY stunnel-md5sum        "253c50435d4d81cba6f19ca34266e6dc">
   <!ENTITY stunnel-size          "484 KB">
-  <!ENTITY stunnel-buildsize     "3.9 MB">
-  <!ENTITY stunnel-time          "0.10 SBU">
+  <!ENTITY stunnel-buildsize     "4.0 MB">
+  <!ENTITY stunnel-time          "0.1 SBU">
 ]>
 
@@ -62,5 +62,5 @@
     </itemizedlist>
 
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <!-- <bridgehead renderas="sect3">Additional Downloads</bridgehead>
     <itemizedlist spacing="compact">
       <listitem>
@@ -68,5 +68,5 @@
         url="ftp://stunnel.mirt.net/stunnel/stunnel-&stunnel-version;-1_minute_sleep_fix.patch"/></para>
       </listitem>
-    </itemizedlist>
+    </itemizedlist> -->
 
     <bridgehead renderas="sect3">Stunnel Dependencies</bridgehead>
@@ -86,11 +86,11 @@
     <command>chroot</command> jail by an unprivileged user. Create the
     new user, group and <command>chroot</command> home directory structure
-    using the following commands as the <systemitem
-    class="username">root</systemitem> user:</para>
+    using the following commands as the
+    <systemitem class="username">root</systemitem> user:</para>
 
 <screen role="root"><userinput>groupadd -g 51 stunnel &amp;&amp;
 useradd -c "Stunnel Daemon" -d /var/lib/stunnel \
         -g stunnel -s /bin/false -u 51 stunnel &amp;&amp;
-install -d -m 700 -o stunnel -g stunnel /var/lib/stunnel/run</userinput></screen>
+install -v -m700 -o stunnel -g stunnel -d /var/lib/stunnel/run</userinput></screen>
 
     <note>
@@ -98,8 +98,8 @@
       the <command>stunnel</command> daemon. If you own, or have already
       created a signed SSL Certificate you wish to use, copy it to
-      <filename>/etc/stunnel/stunnel.pem</filename> before starting the build,
-      otherwise you will be prompted to create one during the installation
-      process. The <filename>.pem</filename> file must be formatted as shown
-      below:</para>
+      <filename>/etc/stunnel/stunnel.pem</filename> before starting the build
+      (ensure only root has read and write access), otherwise you will be
+      prompted to create one during the installation process. The
+      <filename>.pem</filename> file must be formatted as shown below:</para>
 
 <screen><literal>-----BEGIN RSA PRIVATE KEY-----
@@ -108,6 +108,8 @@
 -----BEGIN CERTIFICATE-----
 <replaceable>[many encrypted lines of certificate]</replaceable>
------END CERTIFICATE-----</literal></screen>
-
+-----END CERTIFICATE-----
+-----BEGIN DH PARAMETERS-----
+<replaceable>[multiple encrypted lines of DH parameters]</replaceable>
+-----END DH PARAMETERS-----</literal></screen>
     </note>
 
@@ -115,8 +117,9 @@
     commands:</para>
 
-<screen><userinput>patch -Np1 -i ../stunnel-&stunnel-version;-1_minute_sleep_fix.patch &amp;&amp;
-./configure --prefix=/usr --sysconfdir=/etc \
+<screen><userinput>./configure --prefix=/usr --sysconfdir=/etc \
     --localstatedir=/var/lib &amp;&amp;
 make</userinput></screen>
+
+    <para>This package does not come with a test suite.</para>
 
     <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
@@ -146,5 +149,5 @@
 
     <para>prompt with the name or IP address you will be using
-    to access the service.</para>
+    to access the service(s).</para>
 
   </sect2>
@@ -181,5 +184,5 @@
 EOF</userinput></screen>
 
-    <para>Next, you need to add the service you wish to encrypt to the
+    <para>Next, you need to add the service(s) you wish to encrypt to the
     configuration file. The format is as follows:</para>
 
