Index: basicnet/djb/daemontools/daemontools-intro.xml
===================================================================
--- basicnet/djb/daemontools/daemontools-intro.xml	(revision 7c3bcfabd5a3ff56d8279762a3463887e24ac4f8)
+++ basicnet/djb/daemontools/daemontools-intro.xml	(revision ca3bcd405f9994703791264d179fdf98e60687d9)
@@ -2,5 +2,6 @@
 <title>Introduction to Daemontools</title>
 
-<screen>Download location:              &daemontools-download;
+<screen>Download location (HTTP):       <ulink url="&daemontools-download-http;"/>
+Download location (FTP):        <ulink url="&daemontools-download-ftp;"/>
 Version used:                   &daemontools-version;
 Package size:                   &daemontools-size;
Index: basicnet/djb/daemontools/daemontools-man-intro.xml
===================================================================
--- basicnet/djb/daemontools/daemontools-man-intro.xml	(revision 7c3bcfabd5a3ff56d8279762a3463887e24ac4f8)
+++ basicnet/djb/daemontools/daemontools-man-intro.xml	(revision ca3bcd405f9994703791264d179fdf98e60687d9)
@@ -2,5 +2,6 @@
 <title>Introduction to Daemontools-man</title>
 
-<screen>Download location:              &daemontools-man-download;
+<screen>Download location (HTTP):       <ulink url="&daemontools-man-download-http;"/>
+Download location (FTP):        <ulink url="&daemontools-man-download-ftp;"/>
 Version used:                   &daemontools-man-version;
 Package size:                   &daemontools-man-size;
Index: basicnet/djb/daemontools/daemontools.ent
===================================================================
--- basicnet/djb/daemontools/daemontools.ent	(revision 7c3bcfabd5a3ff56d8279762a3463887e24ac4f8)
+++ basicnet/djb/daemontools/daemontools.ent	(revision ca3bcd405f9994703791264d179fdf98e60687d9)
@@ -6,5 +6,6 @@
 <!ENTITY daemontools-buildsize "approximately 1 MB">
 <!ENTITY daemontools-version "0.76">
-<!ENTITY daemontools-download "http://cr.yp.to/daemontools/daemontools-0.76.tar.gz" >
+<!ENTITY daemontools-download-http "http://cr.yp.to/daemontools/daemontools-0.76.tar.gz" >
+<!ENTITY daemontools-download-ftp "">
 <!ENTITY daemontools-size "162 KB">
 
@@ -16,4 +17,5 @@
 <!ENTITY daemontools-man-buildsize "approximately 1 MB">
 <!ENTITY daemontools-man-version "0.76">
-<!ENTITY daemontools-man-download "http://smarden.org/pape/djb/manpages/daemontools-0.76-man.tar.gz" >
+<!ENTITY daemontools-man-download-http "http://smarden.org/pape/djb/manpages/daemontools-0.76-man.tar.gz" >
+<!ENTITY daemontools-man-download-ftp "">
 <!ENTITY daemontools-man-size "8 KB">
Index: basicnet/djb/ucspi-tcp/ucspi-tcp-intro.xml
===================================================================
--- basicnet/djb/ucspi-tcp/ucspi-tcp-intro.xml	(revision 7c3bcfabd5a3ff56d8279762a3463887e24ac4f8)
+++ basicnet/djb/ucspi-tcp/ucspi-tcp-intro.xml	(revision ca3bcd405f9994703791264d179fdf98e60687d9)
@@ -2,5 +2,6 @@
 <title>Introduction to ucspi-tcp</title>
 
-<screen>Download location:              &ucspi-tcp-download;
+<screen>Download location (HTTP):       <ulink url="&ucspi-tcp-download-http;"/>
+Download location (FTP):        <ulink url="&ucspi-tcp-download-ftp;"/>
 Version used:                   &ucspi-tcp-version;
 Package size:                   &ucspi-tcp-size;
Index: basicnet/djb/ucspi-tcp/ucspi-tcp.ent
===================================================================
--- basicnet/djb/ucspi-tcp/ucspi-tcp.ent	(revision 7c3bcfabd5a3ff56d8279762a3463887e24ac4f8)
+++ basicnet/djb/ucspi-tcp/ucspi-tcp.ent	(revision ca3bcd405f9994703791264d179fdf98e60687d9)
@@ -6,4 +6,5 @@
 <!ENTITY ucspi-tcp-buildsize "199 KB">
 <!ENTITY ucspi-tcp-version "0.88">
-<!ENTITY ucspi-tcp-download "http://cr.yp.to/ucspi-tcp/ucspi-tcp-0.88.tar.gz">
+<!ENTITY ucspi-tcp-download-http "http://cr.yp.to/ucspi-tcp/ucspi-tcp-0.88.tar.gz">
+<!ENTITY ucspi-tcp-download-ftp "">
 <!ENTITY ucspi-tcp-size "53 KB">
Index: basicnet/mailnews/fetchmail/fetchmail-intro.xml
===================================================================
--- basicnet/mailnews/fetchmail/fetchmail-intro.xml	(revision 7c3bcfabd5a3ff56d8279762a3463887e24ac4f8)
+++ basicnet/mailnews/fetchmail/fetchmail-intro.xml	(revision ca3bcd405f9994703791264d179fdf98e60687d9)
@@ -2,5 +2,6 @@
 <title>Introduction to fetchmail</title>
 
-<screen>Download location:              &fetchmail-download;
+<screen>Download location (HTTP):       <ulink url="&fetchmail-download-http;"/>
+Download location (FTP):        <ulink url="&fetchmail-download-ftp;"/>
 Version used:                   &fetchmail-version;
 Package size:                   &fetchmail-size;
Index: basicnet/mailnews/fetchmail/fetchmail.ent
===================================================================
--- basicnet/mailnews/fetchmail/fetchmail.ent	(revision 7c3bcfabd5a3ff56d8279762a3463887e24ac4f8)
+++ basicnet/mailnews/fetchmail/fetchmail.ent	(revision ca3bcd405f9994703791264d179fdf98e60687d9)
@@ -7,4 +7,5 @@
 <!ENTITY fetchmail-buildsize "4.1 MB">
 <!ENTITY fetchmail-version "5.8.15">
-<!ENTITY fetchmail-download "http://www.tuxedo.org/~esr/fetchmail/fetchmail-5.8.15.tar.gz">
+<!ENTITY fetchmail-download-http "http://www.tuxedo.org/~esr/fetchmail/fetchmail-5.8.15.tar.gz">
+<!ENTITY fetchmail-download-ftp "">
 <!ENTITY fetchmail-size "854 KB">
Index: basicnet/netlibs/wvstreams/wvstreams-intro.xml
===================================================================
--- basicnet/netlibs/wvstreams/wvstreams-intro.xml	(revision 7c3bcfabd5a3ff56d8279762a3463887e24ac4f8)
+++ basicnet/netlibs/wvstreams/wvstreams-intro.xml	(revision ca3bcd405f9994703791264d179fdf98e60687d9)
@@ -2,5 +2,6 @@
 <title>Introduction to wvstreams</title>
 
-<screen>Download location:              &wvstreams-download;
+<screen>Download location (HTTP):       <ulink url="&wvstreams-download-http;"/>
+Download location (FTP):        <ulink url="&wvstreams-download-ftp;"/>
 Version used:                   &wvstreams-version;
 Package size:                   &wvstreams-size;
Index: basicnet/netlibs/wvstreams/wvstreams.ent
===================================================================
--- basicnet/netlibs/wvstreams/wvstreams.ent	(revision 7c3bcfabd5a3ff56d8279762a3463887e24ac4f8)
+++ basicnet/netlibs/wvstreams/wvstreams.ent	(revision ca3bcd405f9994703791264d179fdf98e60687d9)
@@ -6,4 +6,5 @@
 <!ENTITY wvstreams-buildsize "9.6 MB">
 <!ENTITY wvstreams-version "3.70">
-<!ENTITY wvstreams-download "http://open.nit.ca/download/wvstreams-3.70.tar.gz">
+<!ENTITY wvstreams-download-http "http://open.nit.ca/download/wvstreams-3.70.tar.gz">
+<!ENTITY wvstreams-download-ftp "">
 <!ENTITY wvstreams-size "178 KB">
Index: basicnet/netprogs/cvs/cvs-intro.xml
===================================================================
--- basicnet/netprogs/cvs/cvs-intro.xml	(revision 7c3bcfabd5a3ff56d8279762a3463887e24ac4f8)
+++ basicnet/netprogs/cvs/cvs-intro.xml	(revision ca3bcd405f9994703791264d179fdf98e60687d9)
@@ -2,5 +2,6 @@
 <title>Introduction to cvs</title>
 
-<screen>Download location:              <ulink url="&cvs-download;"/>
+<screen>Download location (HTTP):       <ulink url="&cvs-download-http;"/>
+Download location (FTP):        <ulink url="&cvs-download-ftp;"/>
 Version used:                   &cvs-version;
 Package size:                   &cvs-size;
Index: basicnet/netprogs/cvs/cvs.ent
===================================================================
--- basicnet/netprogs/cvs/cvs.ent	(revision 7c3bcfabd5a3ff56d8279762a3463887e24ac4f8)
+++ basicnet/netprogs/cvs/cvs.ent	(revision ca3bcd405f9994703791264d179fdf98e60687d9)
@@ -6,4 +6,5 @@
 <!ENTITY cvs-buildsize "14 MB">
 <!ENTITY cvs-version "1.11.2">
-<!ENTITY cvs-download "http://ftp.cvshome.org/cvs-1.11.2/cvs-1.11.2.tar.gz">
+<!ENTITY cvs-download-http "http://ftp.cvshome.org/cvs-1.11.2/cvs-1.11.2.tar.gz">
+<!ENTITY cvs-download-ftp "">
 <!ENTITY cvs-size "2.6 MB">
Index: basicnet/netprogs/ncftp/ncftp-intro.xml
===================================================================
--- basicnet/netprogs/ncftp/ncftp-intro.xml	(revision 7c3bcfabd5a3ff56d8279762a3463887e24ac4f8)
+++ basicnet/netprogs/ncftp/ncftp-intro.xml	(revision ca3bcd405f9994703791264d179fdf98e60687d9)
@@ -2,5 +2,6 @@
 <title>Introduction to ncftp</title>
 
-<screen>Download location:              &ncftp-download;
+<screen>Download location (HTTP):        <ulink url="&ncftp-download-http;"/>
+Download location (FTP):        <ulink url="&ncftp-download-ftp;"/>
 Version used:                   &ncftp-version;
 Package size:                   &ncftp-size;
Index: basicnet/netprogs/ncftp/ncftp.ent
===================================================================
--- basicnet/netprogs/ncftp/ncftp.ent	(revision 7c3bcfabd5a3ff56d8279762a3463887e24ac4f8)
+++ basicnet/netprogs/ncftp/ncftp.ent	(revision ca3bcd405f9994703791264d179fdf98e60687d9)
@@ -7,4 +7,5 @@
 <!ENTITY ncftp-buildsize "5.0 MB">
 <!ENTITY ncftp-version "3.1.2">
-<!ENTITY ncftp-download "ftp://ftp.ncftp.com/ncftp/ncftp-3.1.2-src.tar.bz2">
+<!ENTITY ncftp-download-http "">
+<!ENTITY ncftp-download-ftp "ftp://ftp.ncftp.com/ncftp/ncftp-3.1.2-src.tar.bz2">
 <!ENTITY ncftp-size "378 KB">
Index: basicnet/netprogs/openssh-client.xml
===================================================================
--- basicnet/netprogs/openssh-client.xml	(revision 7c3bcfabd5a3ff56d8279762a3463887e24ac4f8)
+++ basicnet/netprogs/openssh-client.xml	(revision ca3bcd405f9994703791264d179fdf98e60687d9)
@@ -1,8 +1,8 @@
 <sect1 id="basicnet-netprogs-openssh">
 <?dbhtml filename="openssh.html" dir="basicnet"?>
-<title>The OpenSSH-&openssh-version; client</title>
+<title>OpenSSH-&openssh-version; client</title>
 
 <para>The ssh client is a secure replacement for telnet.  If you want to
-install it, the instructions can be found in Chapter 09 - <xref
+install it, the instructions can be found in Chapter 23 - <xref
 linkend="openssh"/>.  Note that if you only want to use the client, you
 do <emphasis>not</emphasis> need to run the server and so do not need
Index: basicnet/netutils/traceroute/traceroute-intro.xml
===================================================================
--- basicnet/netutils/traceroute/traceroute-intro.xml	(revision 7c3bcfabd5a3ff56d8279762a3463887e24ac4f8)
+++ basicnet/netutils/traceroute/traceroute-intro.xml	(revision ca3bcd405f9994703791264d179fdf98e60687d9)
@@ -2,5 +2,6 @@
 <title>Introduction to traceroute</title>
 
-<screen>Download location:              &traceroute-download; 
+<screen>Download location (HTTP):       <ulink url="&traceroute-download-http;"/>
+Download location (FTP):        <ulink url="&traceroute-download-ftp;"/>
 Version used:                   &traceroute-version;
 Package size:                   &traceroute-size;
@@ -12,6 +13,3 @@
 connect to another system, traceroute can help pinpoint the problem.</para>
 
-<screen>Traceroute does not depend on any packages that are not a part of 
-the base LFS system.</screen>
-
 </sect2>
Index: basicnet/netutils/traceroute/traceroute.ent
===================================================================
--- basicnet/netutils/traceroute/traceroute.ent	(revision 7c3bcfabd5a3ff56d8279762a3463887e24ac4f8)
+++ basicnet/netutils/traceroute/traceroute.ent	(revision ca3bcd405f9994703791264d179fdf98e60687d9)
@@ -6,4 +6,5 @@
 <!ENTITY traceroute-buildsize "75 KB">
 <!ENTITY traceroute-version "1.4a12">
-<!ENTITY traceroute-download "ftp://ftp.ee.lbl.gov/traceroute.tar.gz">
+<!ENTITY traceroute-download-http "">
+<!ENTITY traceroute-download-ftp "ftp://ftp.ee.lbl.gov/traceroute.tar.gz">
 <!ENTITY traceroute-size "35 KB">
Index: connect/dhcp/dhcp-client.xml
===================================================================
--- connect/dhcp/dhcp-client.xml	(revision 7c3bcfabd5a3ff56d8279762a3463887e24ac4f8)
+++ connect/dhcp/dhcp-client.xml	(revision ca3bcd405f9994703791264d179fdf98e60687d9)
@@ -1,5 +1,5 @@
 <sect1 id="connect-dhcp-client">
 <?dbhtml filename="dhcpclient.html" dir="connect"?>
-<title>Installing dhcp-&dhcp-version;</title>
+<title>dhcp-&dhcp-version;</title>
 
 <para>The dhcp package comes with both a client and a server program for
Index: content/databases/db/db-intro.xml
===================================================================
--- content/databases/db/db-intro.xml	(revision 7c3bcfabd5a3ff56d8279762a3463887e24ac4f8)
+++ content/databases/db/db-intro.xml	(revision ca3bcd405f9994703791264d179fdf98e60687d9)
@@ -2,5 +2,6 @@
 <title>Introduction to db</title>
 
-<screen>Download location:              &db-download;
+<screen>Download location (HTTP):       <ulink url="&db-download-http;"/>
+Download location (FTP):        <ulink url="&db-download-ftp;"/>
 Version used:                   &db-version;
 Package size:                   &db-size;
Index: content/databases/db/db.ent
===================================================================
--- content/databases/db/db.ent	(revision 7c3bcfabd5a3ff56d8279762a3463887e24ac4f8)
+++ content/databases/db/db.ent	(revision ca3bcd405f9994703791264d179fdf98e60687d9)
@@ -7,4 +7,5 @@
 <!ENTITY db-buildsize "23 MB">
 <!ENTITY db-version "4.0.14">
-<!ENTITY db-download "http://www.sleepycat.com/update/snapshot/db-4.0.14.tar.gz">
+<!ENTITY db-download-http "http://www.sleepycat.com/update/snapshot/db-4.0.14.tar.gz">
+<!ENTITY db-download-ftp "">
 <!ENTITY db-size "2.6 MB">
Index: general/sysutils/which.xml
===================================================================
--- general/sysutils/which.xml	(revision 7c3bcfabd5a3ff56d8279762a3463887e24ac4f8)
+++ general/sysutils/which.xml	(revision ca3bcd405f9994703791264d179fdf98e60687d9)
@@ -1,5 +1,5 @@
 <sect1 id="which" xreflabel="which-&which-version;">
 <?dbhtml filename="which.html" dir="general"?>
-<title>The "which" program / script</title>
+<title>which-&which-version; and alternatives</title>
 
 <para>The presence / absence of the which program in the main LFS book
Index: index.xml
===================================================================
--- index.xml	(revision 7c3bcfabd5a3ff56d8279762a3463887e24ac4f8)
+++ index.xml	(revision ca3bcd405f9994703791264d179fdf98e60687d9)
@@ -3,6 +3,6 @@
 			"/usr/share/docbook/docbookx.dtd" [
 
-<!ENTITY version "20020803">
-<!ENTITY releasedate "August 3rd, 2002">
+<!ENTITY version "20020804">
+<!ENTITY releasedate "August 4th, 2002">
 
 <!ENTITY % book SYSTEM "book/book.ent">
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 7c3bcfabd5a3ff56d8279762a3463887e24ac4f8)
+++ introduction/welcome/changelog.xml	(revision ca3bcd405f9994703791264d179fdf98e60687d9)
@@ -10,4 +10,8 @@
 
 <itemizedlist>
+
+<listitem><para>August 4th, 2002 [larry]: Basic Networking: Update ent
+and intro files to new format.  Server Networking: Update ent and intro
+files to new format.</para></listitem>
 
 <listitem><para>August 3rd, 2002 [larry]: General: added
Index: postlfs/config/logon.xml
===================================================================
--- postlfs/config/logon.xml	(revision 7c3bcfabd5a3ff56d8279762a3463887e24ac4f8)
+++ postlfs/config/logon.xml	(revision ca3bcd405f9994703791264d179fdf98e60687d9)
@@ -1,5 +1,5 @@
 <sect1 id="postlfs-config-logon">
 <?dbhtml filename="logon.html" dir="postlfs"?>
-<title>Customising your logon (/etc/issue)</title>
+<title>/etc/issue (Customising your logon)</title>
 
 <para>When you first boot up your new LFS system, the logon screen will
Index: postlfs/security/iptables.xml
===================================================================
--- postlfs/security/iptables.xml	(revision 7c3bcfabd5a3ff56d8279762a3463887e24ac4f8)
+++ postlfs/security/iptables.xml	(revision ca3bcd405f9994703791264d179fdf98e60687d9)
@@ -1,5 +1,5 @@
 <sect1 id="postlfs-security-iptables">
 <?dbhtml filename="iptables.html" dir="postlfs"?>
-<title>Installing iptables-&iptables-version;</title>
+<title>iptables-&iptables-version;</title>
 
 <para>The next part of this chapter deals with firewalling.  The
Index: postlfs/security/iptables/iptables-intro.xml
===================================================================
--- postlfs/security/iptables/iptables-intro.xml	(revision 7c3bcfabd5a3ff56d8279762a3463887e24ac4f8)
+++ postlfs/security/iptables/iptables-intro.xml	(revision ca3bcd405f9994703791264d179fdf98e60687d9)
@@ -2,5 +2,6 @@
 <title>Introduction to iptables</title>
 
-<screen>Download location:		&iptables-download;
+<screen>Download location (HTTP):       <ulink url="&iptables-download-http;"/>
+Download location (FTP):        <ulink url="&iptables-download-ftp;"/>
 Version used:			&iptables-version;
 Package size:			&iptables-size;
Index: postlfs/security/iptables/iptables.ent
===================================================================
--- postlfs/security/iptables/iptables.ent	(revision 7c3bcfabd5a3ff56d8279762a3463887e24ac4f8)
+++ postlfs/security/iptables/iptables.ent	(revision ca3bcd405f9994703791264d179fdf98e60687d9)
@@ -6,4 +6,5 @@
 <!ENTITY iptables-buildsize "approximately 3.0 MB">
 <!ENTITY iptables-version "1.2.5">
-<!ENTITY iptables-download "http://www.iptables.org/files/iptables-1.2.5.tar.bz2">
+<!ENTITY iptables-download-http "http://www.iptables.org/files/iptables-1.2.5.tar.bz2">
+<!ENTITY iptables-download-ftp "">
 <!ENTITY iptables-size "236 KB">
Index: server/mail/postfix/postfix-intro.xml
===================================================================
--- server/mail/postfix/postfix-intro.xml	(revision 7c3bcfabd5a3ff56d8279762a3463887e24ac4f8)
+++ server/mail/postfix/postfix-intro.xml	(revision ca3bcd405f9994703791264d179fdf98e60687d9)
@@ -2,5 +2,6 @@
 <title>Introduction to postfix</title>
 
-<screen>Download location:              <ulink url="&postfix-download;"/>
+<screen>Download location (HTTP):       <ulink url="&postfix-download-http;"/>
+Download location (FTP):        <ulink url="&postfix-download-ftp;"/>
 Version used:                   &postfix-version;
 Package size:                   &postfix-size;
Index: server/mail/postfix/postfix.ent
===================================================================
--- server/mail/postfix/postfix.ent	(revision 7c3bcfabd5a3ff56d8279762a3463887e24ac4f8)
+++ server/mail/postfix/postfix.ent	(revision ca3bcd405f9994703791264d179fdf98e60687d9)
@@ -6,4 +6,5 @@
 <!ENTITY postfix-buildsize "47 MB">
 <!ENTITY postfix-version "1.1.11">
-<!ENTITY postfix-download "ftp://ftp.porcupine.org/mirrors/postfix-release/official/postfix-1.1.11.tar.gz">
+<!ENTITY postfix-download-http "">
+<!ENTITY postfix-download-ftp "ftp://ftp.porcupine.org/mirrors/postfix-release/official/postfix-1.1.11.tar.gz">
 <!ENTITY postfix-size "1.2 MB">
Index: server/other/dhcp/dhcp-intro.xml
===================================================================
--- server/other/dhcp/dhcp-intro.xml	(revision 7c3bcfabd5a3ff56d8279762a3463887e24ac4f8)
+++ server/other/dhcp/dhcp-intro.xml	(revision ca3bcd405f9994703791264d179fdf98e60687d9)
@@ -2,5 +2,6 @@
 <title>Introduction to dhcp</title>
 
-<screen>Download location:              <ulink url="&dhcp-download;"/>
+<screen>Download location (HTTP):       <ulink url="&dhcp-download-http;"/>
+Download location (FTP):        <ulink url="&dhcp-download-ftp;"/>
 Version used:                   &dhcp-version;
 Package size:                   &dhcp-size;
Index: server/other/dhcp/dhcp.ent
===================================================================
--- server/other/dhcp/dhcp.ent	(revision 7c3bcfabd5a3ff56d8279762a3463887e24ac4f8)
+++ server/other/dhcp/dhcp.ent	(revision ca3bcd405f9994703791264d179fdf98e60687d9)
@@ -9,4 +9,5 @@
 <!ENTITY dhcp-buildsize "23 MB">
 <!ENTITY dhcp-version "3.0pl1">
-<!ENTITY dhcp-download "ftp://ftp.isc.org/isc/dhcp/dhcp-3.0pl1.tar.gz">
+<!ENTITY dhcp-download-http "">
+<!ENTITY dhcp-download-ftp "ftp://ftp.isc.org/isc/dhcp/dhcp-3.0pl1.tar.gz">
 <!ENTITY dhcp-size "845 KB">
Index: server/other/openssh/openssh-intro.xml
===================================================================
--- server/other/openssh/openssh-intro.xml	(revision 7c3bcfabd5a3ff56d8279762a3463887e24ac4f8)
+++ server/other/openssh/openssh-intro.xml	(revision ca3bcd405f9994703791264d179fdf98e60687d9)
@@ -2,5 +2,6 @@
 <title>Introduction to OpenSSH</title>
 
-<screen>Download location:              <ulink url="&openssh-download;"/>
+<screen>Download location (HTTP):       <ulink url="&openssh-download-http;"/>
+Download location (FTP):        <ulink url="&openssh-download-ftp;"/>
 Version used:                   &openssh-version;
 Package size:                   &openssh-size;
Index: server/other/openssh/openssh.ent
===================================================================
--- server/other/openssh/openssh.ent	(revision 7c3bcfabd5a3ff56d8279762a3463887e24ac4f8)
+++ server/other/openssh/openssh.ent	(revision ca3bcd405f9994703791264d179fdf98e60687d9)
@@ -7,4 +7,5 @@
 <!ENTITY openssh-buildsize "7.9 MB">
 <!ENTITY openssh-version "3.4p1">
-<!ENTITY openssh-download "ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-3.4p1.tar.gz">
+<!ENTITY openssh-download-http "">
+<!ENTITY openssh-download-ftp "ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-3.4p1.tar.gz">
 <!ENTITY openssh-size "816 KB">
