diff --git a/basicnet/mailnews/pine/pine-exp.xml b/basicnet/mailnews/pine/pine-exp.xml
index 5453777962..97e46c96b2 100644
--- a/basicnet/mailnews/pine/pine-exp.xml
+++ b/basicnet/mailnews/pine/pine-exp.xml
@@ -15,10 +15,16 @@ quite a few target platforms, slx specifies Linux using
 -lcrypt to get the crypt function.  See the
 <filename>doc/pine-ports</filename> file for more information and
 other authentication options.</para>
-<!--
-<para><command>DEBUG='-Os '</command>: Optimize binaries for size.</para>
--->
-<para><command>MAILSPOOL='/var/mail'</command>: Location of mail spool files, <filename>/var/mail.</filename></para>
+
+<para><command>DEBUG=-O</command>: This flag compiles an optimized
+version of <command>pine</command> and <command>pico</command> that
+produces no debug files.</para>
+
+<para><command>MAILSPOOL=/var/mail</command>: Location of mail spool
+files, <filename>/var/mail.</filename></para>
+
+<para><command>SSLDIR=/usr SSLCERTS=/etc/ssl/certs</command>: Location
+of OpenSSL files.</para>
 
 <para><screen><command>cd bin &amp;&amp;
 install pine imapd ipop2d ipop3d mailutil mtest pico pilot rpdump \
@@ -26,4 +32,3 @@ rpload /usr/bin</command></screen>
 This installs <application>Pine</application>.</para>
 
 </sect2>
-
diff --git a/basicnet/mailnews/pine/pine-inst.xml b/basicnet/mailnews/pine/pine-inst.xml
index 0d58082e7f..a65e01bdbf 100644
--- a/basicnet/mailnews/pine/pine-inst.xml
+++ b/basicnet/mailnews/pine/pine-inst.xml
@@ -4,9 +4,9 @@
 <para>Install <application>Pine</application> by running the following commands: </para>
 
 <screen><userinput><command>patch -Np1 -i ../pine-&pine-version;-fhs.patch &amp;&amp;
-./build slx <!-- DEBUG='-Os '--> MAILSPOOL='/var/mail' \
-SSLDIR=/usr SSLCERTS=/etc/ssl/certs &amp;&amp;
-cp doc/pine.1 doc/pico.1 doc/rpdump.1 doc/rpload.1  /usr/share/man/man1 &amp;&amp;    
+./build DEBUG=-O MAILSPOOL=/var/mail \
+SSLDIR=/usr SSLCERTS=/etc/ssl/certs slx &amp;&amp;
+cp doc/{pine,pico,rpdump,rpload}.1 /usr/share/man/man1 &amp;&amp;    
 cd bin &amp;&amp;
 install pine imapd ipop2d ipop3d mailutil mtest pico pilot rpdump \
 rpload /usr/bin</command></userinput></screen>
diff --git a/basicnet/mailnews/pine/pine-intro.xml b/basicnet/mailnews/pine/pine-intro.xml
index b13091b06b..438bcc76b7 100644
--- a/basicnet/mailnews/pine/pine-intro.xml
+++ b/basicnet/mailnews/pine/pine-intro.xml
@@ -29,7 +29,7 @@ url="&pine-download-ftp;"/></para></listitem>
 <sect3><title>Additional downloads</title>
 <itemizedlist spacing='compact'>
 <listitem><para>Recommended patch: <ulink
-url="&patch-root;/pine-4.56-fhs.patch"/></para></listitem>
+url="&patch-root;/pine-&pine-version;-fhs.patch"/></para></listitem>
 </itemizedlist>
 </sect3>
 
diff --git a/basicnet/mailnews/pine/pine.ent b/basicnet/mailnews/pine/pine.ent
index 58c39914c2..ce7cfd3a38 100644
--- a/basicnet/mailnews/pine/pine.ent
+++ b/basicnet/mailnews/pine/pine.ent
@@ -4,9 +4,9 @@
 <!ENTITY pine-exp SYSTEM "pine-exp.xml">
 <!ENTITY pine-config SYSTEM "pine-config.xml">
 <!ENTITY pine-desc SYSTEM "pine-desc.xml">
-<!ENTITY pine-version "4.56">
+<!ENTITY pine-version "4.58">
 <!ENTITY pine-download-http "http://mirror.sit.wisc.edu/pub/net/mail/pine/pine&pine-version;.tar.bz2">
 <!ENTITY pine-download-ftp "ftp://ftp.cac.washington.edu/pine/pine&pine-version;.tar.bz2">
-<!ENTITY pine-size "2.8 MB">
-<!ENTITY pine-buildsize "54 MB">
-<!ENTITY pine-time "">
+<!ENTITY pine-size "2.7 MB">
+<!ENTITY pine-buildsize "60 MB">
+<!ENTITY pine-time "0.73 SBU">
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index b162ebee63..3fe4471112 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -11,6 +11,9 @@ who wrote what.</para>
 
 <itemizedlist>
 
+<listitem><para>October 26th, 2003 [igor]: Updated to
+Pine-4.58.</para></listitem>
+
 <listitem><para>October 24th, 2003 [igor]: Apache: set proper
 permissions for installed files.</para></listitem>