Index: general.ent
===================================================================
--- general.ent	(revision 5091d1a7225d2974bccf5fe7a2b4ef624e3b2895)
+++ general.ent	(revision df7d6378d686beb3e56f23b75c858c4c93abfe0d)
@@ -163,5 +163,5 @@
 <!-- Chapter 18 -->               
 <!ENTITY ncftp-version                "3.1.7"> 
-<!ENTITY openssh-version              "3.8.1p1"> 
+<!ENTITY openssh-version              "3.9p1"> 
 <!ENTITY rsync-version                "2.6.2"> 
 <!ENTITY cvs-version                  "1.11.17">  
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 5091d1a7225d2974bccf5fe7a2b4ef624e3b2895)
+++ introduction/welcome/changelog.xml	(revision df7d6378d686beb3e56f23b75c858c4c93abfe0d)
@@ -24,5 +24,5 @@
 
 <listitem><para>October 15th, 2004 [randy]: Updated to
-GMP-4.1.4.</para></listitem>
+GMP-4.1.4 and OpenSSH-3.9p1.</para></listitem>
 
 <listitem><para>October 15th, 2004 [randy]: Updated to
Index: server/other/openssh.xml
===================================================================
--- server/other/openssh.xml	(revision 5091d1a7225d2974bccf5fe7a2b4ef624e3b2895)
+++ server/other/openssh.xml	(revision df7d6378d686beb3e56f23b75c858c4c93abfe0d)
@@ -7,8 +7,7 @@
 <!ENTITY openssh-download-http "http://sunsite.ualberta.ca/pub/OpenBSD/OpenSSH/portable/openssh-&openssh-version;.tar.gz">
 <!ENTITY openssh-download-ftp "ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-&openssh-version;.tar.gz">
-<!ENTITY openssh-size "799 KB">
-<!ENTITY openssh-buildsize "37 MB">
-<!ENTITY openssh-time "0.49 SBU">
-
+<!ENTITY openssh-size "854 KB">
+<!ENTITY openssh-buildsize "13.3 MB">
+<!ENTITY openssh-time "0.40 SBU">
 ]>
 
@@ -22,9 +21,11 @@
 
 <sect2>
-<title>Introduction to <application>Open<acronym>SSH</acronym></application></title>
+<title>Introduction to 
+<application>Open<acronym>SSH</acronym></application></title>
 
 <para>The <application>Open<acronym>SSH</acronym></application> package 
-contains <command>ssh</command> clients and the <command>sshd</command> daemon.
-This is useful for encrypting authentication and subsequent traffic over a network.</para>
+contains <command>ssh</command> clients and the <command>sshd</command> daemon. 
+This is useful for encrypting authentication and subsequent traffic over a 
+network.</para>
 
 <sect3><title>Package information</title>
@@ -37,13 +38,16 @@
 </sect3>
 
-<sect3><title><application>Open<acronym>SSH</acronym></application> dependencies</title>
+<sect3><title><application>Open<acronym>SSH</acronym></application> 
+dependencies</title>
 <sect4><title>Required</title>
-<para><xref linkend="openssl"/></para></sect4>
+<para><xref linkend="openssl"/></para>
+</sect4>
 <sect4><title>Optional</title>
-<para>
-<xref linkend="Linux_PAM"/>,
-<xref linkend="tcpwrappers"/>,
-X (<xref linkend="xfree86"/> or <xref linkend="xorg"/>),
-<xref linkend="mitkrb"/> or <xref linkend="heimdal"/>, and
+<para><xref linkend="Linux_PAM"/>, 
+<xref linkend="tcpwrappers"/>, 
+X (<xref linkend="xfree86"/> or <xref linkend="xorg"/>), 
+<xref linkend="mitkrb"/> or <xref linkend="heimdal"/>, 
+<xref linkend="j2sdk"/>, 
+<xref linkend="net-tools"/> and 
 <ulink url="http://www.opensc.org/">OpenSC</ulink>
 </para></sect4>
@@ -53,13 +57,13 @@
 
 <sect2>
-<title>Installation of <application>Open<acronym>SSH</acronym></application></title>
+<title>Installation of 
+<application>Open<acronym>SSH</acronym></application></title>
 
 <para><application>Open<acronym>SSH</acronym></application> runs as two 
-processes when connecting to other
-computers. The first process is a privileged process and controls the
-issuance of privileges as necessary. The second process communicates
-with the network. Additional installation steps are necessary to set up
-the proper environment which are performed by the following
-commands:</para>
+processes when connecting to other computers. The first process is a 
+privileged process and controls the issuance of privileges as necessary. 
+The second process communicates with the network. Additional installation 
+steps are necessary to set up the proper environment, which are performed 
+by the following commands:</para>
 
 <screen><userinput><command>mkdir /var/empty &amp;&amp;
@@ -71,6 +75,7 @@
 linked <application>OpenSSL</application> libraries. If you recompile
 <application>OpenSSL</application>, <application>OpenSSH</application> may
-fail to startup. An alternative is to link against the static <application>OpenSSL</application>
-library. To link against the static library, execute the following command:</para>
+fail to startup. An alternative is to link against the static 
+<application>OpenSSL</application> library. To link against the static 
+library, execute the following command:</para>
 
 <screen><userinput><command>sed -i "s:-lcrypto:/usr/lib/libcrypto.a:g" configure</command></userinput></screen>
@@ -90,5 +95,6 @@
 
 <para><parameter>--sysconfdir=/etc/ssh</parameter>: This prevents the 
-configuration files from going to <filename class="directory">/usr/etc</filename>.</para>
+configuration files from going to 
+<filename class="directory">/usr/etc</filename>.</para>
 
 <para><parameter>--with-md5-passwords</parameter>: This is required
@@ -100,9 +106,9 @@
 
 <para><parameter>--libexecdir=/usr/sbin</parameter>:
-<application>Open<acronym>SSH</acronym></application> installs
-programs called by programs in <filename class="directory">/usr/libexec</filename>.
+<application>Open<acronym>SSH</acronym></application> installs programs called 
+by programs in <filename class="directory">/usr/libexec</filename>.
 <command>sftp-server</command> is a <command>sshd</command>
 utility and <command>ssh-askpass</command> is a <command>ssh-add</command> 
-utility that is installed as a link to <command>X11-ssh-askpass</command>.  
+utility that is installed as a link to <command>X11-ssh-askpass</command>. 
 Both of these should go in <filename class="directory">/usr/sbin</filename> 
 not <filename class="directory">/usr/libexec</filename>.</para>
@@ -115,18 +121,20 @@
 <sect3><title>Config files</title>
 
-<para><filename>/etc/ssh/ssh_config</filename>,
+<para><filename>/etc/ssh/ssh_config</filename> and 
 <filename>/etc/ssh/sshd_config </filename></para>
-<para>There are no required changes in either of these files.  However
+
+<para>There are no required changes to either of these files. However,  
 you may wish to view them to make changes for appropriate security to
 your system. Configuration information can be found in the man pages for
-<command>sshd</command>, <command>ssh</command> and <command>ssh-agent
-</command></para>
+<command>sshd</command>, <command>ssh</command> and 
+<command>ssh-agent</command></para>
 </sect3>
 
 <sect3><title>sshd init.d script</title>
 
-<para>To start the SSH Server at boot, install the <filename>/etc/rc.d/init.d/sshd</filename>
-init script included in the <xref linkend="intro-important-bootscripts"/> package.</para>
-                                                                                                                
+<para>To start the <acronym>SSH</acronym> server at system boot, install the 
+<filename>/etc/rc.d/init.d/sshd</filename> init script included in the 
+<xref linkend="intro-important-bootscripts"/> package.</para>
+
 <screen><userinput><command>make install-sshd</command></userinput></screen>
 
@@ -138,9 +146,9 @@
 <title>Contents</title>
 
-<para>The <application>Open<acronym>SSH</acronym></application> package contains <command>ssh</command>,
-<command>sshd</command>, <command>ssh-agent</command>,
-<command>ssh-add</command>, <command>sftp</command>,
-<command>scp</command>, <command>ssh-keygen</command>,
-<command>sftp-server</command> and
+<para>The <application>Open<acronym>SSH</acronym></application> package 
+contains <command>ssh</command>, <command>sshd</command>, 
+<command>ssh-agent</command>, <command>ssh-add</command>, 
+<command>sftp</command>, <command>scp</command>, 
+<command>ssh-keygen</command>, <command>sftp-server</command> and 
 <command>ssh-keyscan</command>.</para>
 
@@ -150,8 +158,10 @@
 
 <sect3><title>ssh</title>
-<para>The basic rlogin/rsh-like client program.</para></sect3>
+<para>The basic <command>rlogin</command>/<command>rsh</command>-like 
+client program.</para></sect3>
 
 <sect3><title>sshd</title>
-<para>The daemon that listens for ssh login requests.</para></sect3>
+<para>The daemon that listens for <command>ssh</command> login 
+requests.</para></sect3>
 
 <sect3><title>ssh-agent</title>
@@ -166,5 +176,5 @@
 
 <sect3><title>scp</title>
-<para>File copy program that acts like rcp.</para></sect3>
+<para>File copy program that acts like <command>rcp</command>.</para></sect3>
 
 <sect3><title>ssh-keygen</title>
@@ -175,5 +185,6 @@
 
 <sect3><title>ssh-keyscan</title>
-<para>Utility for gathering public host keys from a number of hosts.</para></sect3>
+<para>Utility for gathering public host keys from a number of 
+hosts.</para></sect3>
 
 </sect2>
