diff --git a/web/download.htm b/web/download.htm
index 8e70020db..a9e74fc98 100644
--- a/web/download.htm
+++ b/web/download.htm
@@ -16,11 +16,14 @@
  cellspacing="0">
   <tbody>
     <tr>
-      <td style="vertical-align: top;"><a href="#Which"><span
- style="font-weight: bold;">Package Information</span></a><br>
-      </td>
+      <td style="vertical-align: top; font-weight: bold;"><a
+ href="#Distros">Package Information</a><a href="#Distros"><br>
+      </a> </td>
+      <td style="vertical-align: top; font-weight: bold;"><a
+ href="#Distros">Distribution-specific Download Sites<br>
+      </a></td>
       <td style="vertical-align: top;"><a href="#Sites"><span
- style="font-weight: bold;">Download Sites</span></a><br>
+ style="font-weight: bold;">Standard Download Sites</span></a><br>
       </td>
       <td style="vertical-align: top;"><a href="#Updates"><span
  style="font-weight: bold;">Finding Updates that Correct Known Problems</span></a><br>
@@ -118,6 +121,7 @@ single execution of the
 rpm utility.<br>
 </p>
 <p>Here are the <a href="Install.htm">installation instructions</a>.</p>
+<h2><a name="Distros"></a>Distribution-specific Download Sites</h2>
 <p>Once you've printed the appropriate QuickStart Guide, download the
 appropriate modules:</p>
 <ul>
@@ -165,9 +169,15 @@ Testing Branch</a> and the <a
  href="http://packages.debian.org/unstable/net/">Debian
 Unstable Branch</a>. Additionally, packages for the current Debian
 stable release are available from the package maintainer's <a
- href="http://people.connexer.com/%7Eroberto/debian/">personal page</a>.
+ href="http://people.connexer.com/%7Eroberto/debian/">personal page</a>.<br>
+    <br>
     </p>
   </li>
+  <li>If you run <a style="font-weight: bold;" href="Ubuntu">Ubuntu,</a>
+Benjamin Montgomery maintains a <a
+ href="https://launchpad.net/%7Ebmonty/+archive/ppa">repository for
+Hardy Heron</a>.<br>
+  </li>
   <li>
     <p style="margin-bottom: 0in;">If you run <a
  style="font-weight: bold;" href="http://leaf.sourceforge.net/">LEAF/Bering</a>
@@ -203,12 +213,14 @@ are available at <a target="_top"
   <li>
     <p><span style="font-weight: bold;">Otherwise</span>, download the<span
  style="font-style: italic;"> </span>appropriate
-tarballs (.tgz or tar.bz2) </p>
+tarballs (.tgz or tar.bz2) from one of the standard download sites
+below.<br>
+    </p>
   </li>
 </ul>
 <p>You will probably also want to download the HTML version of the
 documentation for easy reference.</p>
-<h2><a name="Sites"></a><b>Download Sites</b></h2>
+<h2><a name="Sites"></a><b>Standard Download Sites</b></h2>
 <p style="margin-left: 0.42in;">Use the sites below to download the
 <b>tarball</b>, the <b>documentation</b> and the <b>standard RPM</b>
 for
@@ -353,21 +365,6 @@ using our public key <a
     </table>
   </dd>
 </dl>
-<p style="margin-left: 0.42in;"><b>Redhat</b> and <b>Fedora</b> RPMS
-provided
-by Simon Matter: <a href="http://www.invoca.ch/pub/packages/shorewall/">http://www.invoca.ch/pub/packages/shorewall/</a><br>
-<br>
-<b></b><a target="_top" href="http://www.slackware.com/"><span
- style="font-weight: bold;">Slackware</span></a> SlackBuild scripts are
-at <a target="_top"
- href="http://slackbuilds.org/result/?search=shorewall&amp;sv=">http://slackbuilds.org/result/?search=shorewall&amp;sv=</a>.<br>
-<br>
-<b>OpenWRT</b> package provided by Marc Zonzon: <a
- href="http://www.iut-lannion.fr/ZONZON/memos_index.php?part=Network&amp;section=WRTMemo&amp;subsec=shorewall">http://www.iut-lannion.fr/ZONZON/memos_index.php?part=Network&amp;section=WRTMemo&amp;subsec=shorewall</a><br>
-<br>
-<b>Leaf/Bering </b>package is available at <a
- href="http://leaf.sourceforge.net/bering-uclibc/index.php?module=pagemaster&amp;PAGE_user_op=view_page&amp;PAGE_id=3&amp;MMN_position=3:3">http://leaf.sourceforge.net/bering-uclibc/index.php?module=pagemaster&amp;PAGE_user_op=view_page&amp;PAGE_id=3&amp;MMN_position=3:3</a><br>
-</p>
 <h2><a name="Updates"></a>Finding Updates that Correct Known Problems</h2>
 <p>Beginning with Shorewall 4.0.6, updated packages that include fixes
 to