Updating lenny cd includes.

16 files changed, 612 insertions, 760 deletions

diff --git a/includes/lenny/install/README.html b/includes/lenny/install/README.html
index 1717250..0a41ba2 100644
--- a/includes/lenny/install/README.html
+++ b/includes/lenny/install/README.html
@@ -57,7 +57,7 @@
 
     <p id="breadcrumbs">
       <span class="alt">(<a href= "README.txt">Text version</a>)</span>
-      Debian GNU/Linux testing "Lenny" - Official RC i386 BC Binary-1 20081104-23:45
+      Debian GNU/Linux testing "Lenny" - Official Snapshot i386 NETINST Binary-1 20090208-03:19
     </p>
   </div><!-- end header -->
 
@@ -104,12 +104,12 @@
     </h2>
 
     <p>This disc is labeled
-    <small><strong>Debian GNU/Linux testing "Lenny" - Official RC i386 BC Binary-1 20081104-23:45</strong></small>
+    <small><strong>Debian GNU/Linux testing "Lenny" - Official Snapshot i386 NETINST Binary-1 20090208-03:19</strong></small>
     .
     It contains programs ("binaries") for `i386' computers.</p>
-    <p>This disc is a <em>business card</em> image.  It contains only the
-    installer and will download the base system and the remaining packages from
-    the network.</p>
+    <p>This disc is a <em>netinst</em> image.  It contains the installer and
+    a very basic system.  Any other packages you might want to install will
+    be downloaded from the network.</p>
     <p>The Release Notes for "lenny" are available on the
     <a href="http://www.debian.org/releases/lenny/releasenotes">Debian web
     site</a>.</p>
@@ -125,10 +125,6 @@
     <p>An <b>Installation Guide</b> for this disc is available from
     <a href="http://www.debian.org/releases/lenny/installmanual">the
     Debian web site</a>.</p>
-    <p>Programs and other files that are needed for the installation can be
-    found on this disc under
-    <tt><a href="tools/">/tools/</a></tt>
-    and <tt><a href="install/floppy/">/install/floppy/</a></tt>
     </p>
 
     <p>For the impatient ones: you can start the installation program easily by
@@ -145,10 +141,15 @@
     </h2>
 
     <ul>
-      <li>You should keep in mind that this is an unofficial disc of the Debian
-      system. This means that all sorts of bugs may be present anywhere in the
-      system. Please report any bugs you find to the person that gave you this
-      disc, not Debian.</li>
+      <li>You should keep in mind that this is a beta disc of the current
+      development version of the Debian system. This means that all sorts of
+      bugs may be present anywhere in the system. Please report any bugs you
+      find in the Debian Bug Tracking System; details at <a
+      href="http://bugs.debian.org/">bugs.debian.org</a>.</li>
+
+      <li>If you're reporting bugs against this disc or the installation
+      system, please also mention the version of this disc; this can be found
+      in the file <tt><a href="/.disk/info">/.disk/info</a></tt>.</li>
 
     </ul>
 
diff --git a/includes/lenny/install/README.mirrors.html b/includes/lenny/install/README.mirrors.html
index 0518305..4b716b7 100644
--- a/includes/lenny/install/README.mirrors.html
+++ b/includes/lenny/install/README.mirrors.html
@@ -59,97 +59,97 @@ Everything else you want to know about Debian mirrors:
 <tr>
   <td>Austria</td>
   <td><a href="http://ftp.at.debian.org/debian/">ftp.at.debian.org/debian/</a></td>
-  <td><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+  <td><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
   <td>Australia</td>
   <td><a href="http://ftp.au.debian.org/debian/">ftp.au.debian.org/debian/</a></td>
-  <td><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+  <td><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
   <td>Belgium</td>
   <td><a href="http://ftp.be.debian.org/debian/">ftp.be.debian.org/debian/</a></td>
-  <td><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+  <td><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
   <td>Bulgaria</td>
   <td><a href="http://ftp.bg.debian.org/debian/">ftp.bg.debian.org/debian/</a></td>
-  <td><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+  <td><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
   <td>Brazil</td>
   <td><a href="http://ftp.br.debian.org/debian/">ftp.br.debian.org/debian/</a></td>
-  <td><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+  <td><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
   <td>Canada</td>
   <td><a href="http://ftp.ca.debian.org/debian/">ftp.ca.debian.org/debian/</a></td>
-  <td><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+  <td><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
   <td>Switzerland</td>
   <td><a href="http://ftp.ch.debian.org/debian/">ftp.ch.debian.org/debian/</a></td>
-  <td><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+  <td><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
   <td>Chile</td>
   <td><a href="http://ftp.cl.debian.org/debian/">ftp.cl.debian.org/debian/</a></td>
-  <td><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+  <td><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
   <td>Czech&nbsp;Republic</td>
   <td><a href="http://ftp.cz.debian.org/debian/">ftp.cz.debian.org/debian/</a></td>
-  <td><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+  <td><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
   <td>Germany</td>
   <td><a href="http://ftp.de.debian.org/debian/">ftp.de.debian.org/debian/</a></td>
-  <td><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+  <td><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
   <td>Germany</td>
   <td><a href="http://ftp2.de.debian.org/debian/">ftp2.de.debian.org/debian/</a></td>
-  <td><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+  <td><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
   <td>Denmark</td>
   <td><a href="http://ftp.dk.debian.org/debian/">ftp.dk.debian.org/debian/</a></td>
-  <td><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+  <td><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
   <td>Estonia</td>
   <td><a href="http://ftp.ee.debian.org/debian/">ftp.ee.debian.org/debian/</a></td>
-  <td><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+  <td><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
   <td>Spain</td>
   <td><a href="http://ftp.es.debian.org/debian/">ftp.es.debian.org/debian/</a></td>
-  <td><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+  <td><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
   <td>Finland</td>
   <td><a href="http://ftp.fi.debian.org/debian/">ftp.fi.debian.org/debian/</a></td>
-  <td><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+  <td><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
   <td>France</td>
   <td><a href="http://ftp.fr.debian.org/debian/">ftp.fr.debian.org/debian/</a></td>
-  <td><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+  <td><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
   <td>France</td>
   <td><a href="http://ftp2.fr.debian.org/debian/">ftp2.fr.debian.org/debian/</a></td>
-  <td><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+  <td><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
   <td>Great&nbsp;Britain</td>
   <td><a href="http://ftp.uk.debian.org/debian/">ftp.uk.debian.org/debian/</a></td>
-  <td><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+  <td><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
   <td>Greece</td>
   <td><a href="http://ftp.gr.debian.org/debian/">ftp.gr.debian.org/debian/</a></td>
-  <td><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+  <td><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
   <td>Hong&nbsp;Kong</td>
@@ -159,52 +159,52 @@ Everything else you want to know about Debian mirrors:
 <tr>
   <td>Croatia</td>
   <td><a href="http://ftp.hr.debian.org/debian/">ftp.hr.debian.org/debian/</a></td>
-  <td><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+  <td><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
   <td>Hungary</td>
   <td><a href="http://ftp.hu.debian.org/debian/">ftp.hu.debian.org/debian/</a></td>
-  <td><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+  <td><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
   <td>Ireland</td>
   <td><a href="http://ftp.ie.debian.org/debian/">ftp.ie.debian.org/debian/</a></td>
-  <td><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+  <td><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
   <td>Iceland</td>
   <td><a href="http://ftp.is.debian.org/debian/">ftp.is.debian.org/debian/</a></td>
-  <td><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+  <td><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
   <td>Italy</td>
   <td><a href="http://ftp.it.debian.org/debian/">ftp.it.debian.org/debian/</a></td>
-  <td><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+  <td><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
   <td>Japan</td>
   <td><a href="http://ftp.jp.debian.org/debian/">ftp.jp.debian.org/debian/</a></td>
-  <td><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+  <td><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
   <td>Japan</td>
   <td><a href="http://ftp2.jp.debian.org/debian/">ftp2.jp.debian.org/debian/</a></td>
-  <td><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+  <td><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
   <td>Korea</td>
   <td><a href="http://ftp.kr.debian.org/debian/">ftp.kr.debian.org/debian/</a></td>
-  <td><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+  <td><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
   <td>Mexico</td>
   <td><a href="http://ftp.mx.debian.org/debian/">ftp.mx.debian.org/debian/</a></td>
-  <td><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+  <td><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
   <td>Netherlands</td>
   <td><a href="http://ftp.nl.debian.org/debian/">ftp.nl.debian.org/debian/</a></td>
-  <td><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+  <td><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
   <td>Norway</td>
@@ -214,57 +214,62 @@ Everything else you want to know about Debian mirrors:
 <tr>
   <td>New&nbsp;Zealand</td>
   <td><a href="http://ftp.nz.debian.org/debian/">ftp.nz.debian.org/debian/</a></td>
-  <td><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+  <td><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
   <td>Poland</td>
   <td><a href="http://ftp.pl.debian.org/debian/">ftp.pl.debian.org/debian/</a></td>
-  <td><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+  <td><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
   <td>Portugal</td>
   <td><a href="http://ftp.pt.debian.org/debian/">ftp.pt.debian.org/debian/</a></td>
-  <td><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+  <td><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
   <td>Romania</td>
   <td><a href="http://ftp.ro.debian.org/debian/">ftp.ro.debian.org/debian/</a></td>
-  <td><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+  <td><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
   <td>Russia</td>
   <td><a href="http://ftp.ru.debian.org/debian/">ftp.ru.debian.org/debian/</a></td>
-  <td><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+  <td><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
   <td>Sweden</td>
   <td><a href="http://ftp.se.debian.org/debian/">ftp.se.debian.org/debian/</a></td>
-  <td><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+  <td><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
   <td>Slovenia</td>
   <td><a href="http://ftp.si.debian.org/debian/">ftp.si.debian.org/debian/</a></td>
-  <td><small><small>alpha amd64 i386 ia64 m68k powerpc sparc</small></small></td>
+  <td><small><small>amd64 i386 powerpc sparc</small></small></td>
 </tr>
 <tr>
   <td>Slovakia</td>
   <td><a href="http://ftp.sk.debian.org/debian/">ftp.sk.debian.org/debian/</a></td>
-  <td><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+  <td><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
   <td>Turkey</td>
   <td><a href="http://ftp.tr.debian.org/debian/">ftp.tr.debian.org/debian/</a></td>
-  <td><small><small>alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+  <td><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
   <td>Taiwan</td>
   <td><a href="http://ftp.tw.debian.org/debian/">ftp.tw.debian.org/debian/</a></td>
-  <td><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+  <td><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
+</tr>
+<tr>
+  <td>Ukraine</td>
+  <td><a href="http://ftp.ua.debian.org/debian/">ftp.ua.debian.org/debian/</a></td>
+  <td><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
   <td>United&nbsp;States</td>
   <td><a href="http://ftp.us.debian.org/debian/">ftp.us.debian.org/debian/</a></td>
-  <td><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+  <td><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 </table>
 <h2 align="center">Secondary mirrors of the Debian archive</h2>
@@ -296,7 +301,7 @@ Everything else you want to know about Debian mirrors:
 <td valign=top>debian.torredehanoi.org</td>
 <td valign=top><a href="ftp://debian.torredehanoi.org/debian/">/debian/</a></td>
 <td valign=top><a href="http://debian.torredehanoi.org/debian/">/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 
 <tr><td colspan=4><hr size=1></td></tr>
@@ -306,13 +311,13 @@ Everything else you want to know about Debian mirrors:
 <td valign=top>ftp.at.debian.org<br>  (debian.sil.at)</td>
 <td valign=top><a href="ftp://ftp.at.debian.org/debian/">/debian/</a></td>
 <td valign=top><a href="http://ftp.at.debian.org/debian/">/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>gd.tuwien.ac.at</td>
 <td valign=top><a href="ftp://gd.tuwien.ac.at/opsys/linux/debian/">/opsys/linux/debian/</a></td>
 <td valign=top><a href="http://gd.tuwien.ac.at/opsys/linux/debian/">/opsys/linux/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>debian.mur.at</td>
@@ -324,7 +329,7 @@ Everything else you want to know about Debian mirrors:
 <td valign=top>ftp.tu-graz.ac.at</td>
 <td valign=top><a href="ftp://ftp.tu-graz.ac.at/mirror/debian/">/mirror/debian/</a></td>
 <td valign=top><a href="http://ftp.tu-graz.ac.at/mirror/debian/">/mirror/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>ftp.univie.ac.at</td>
@@ -339,16 +344,10 @@ Everything else you want to know about Debian mirrors:
 <td valign=top><small><small>alpha amd64 arm armel i386 powerpc sparc</small></small></td>
 </tr>
 <tr>
-<td valign=top>esda.wu-wien.ac.at</td>
-<td valign=top><a href="ftp://esda.wu-wien.ac.at/pub/debian/">/pub/debian/</a></td>
-<td></td>
-<td valign=top><small><small>amd64 i386 powerpc</small></small></td>
-</tr>
-<tr>
 <td valign=top>debian.lagis.at</td>
 <td valign=top><a href="ftp://debian.lagis.at/debian/">/debian/</a></td>
 <td valign=top><a href="http://debian.lagis.at/debian/">/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 
 <tr><td colspan=4><hr size=1></td></tr>
@@ -358,13 +357,13 @@ Everything else you want to know about Debian mirrors:
 <td valign=top>ftp.au.debian.org<br>  (mirror.linux.org.au)</td>
 <td valign=top><a href="ftp://ftp.au.debian.org/debian/">/debian/</a></td>
 <td valign=top><a href="http://ftp.au.debian.org/debian/">/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>mirror.aarnet.edu.au</td>
 <td valign=top><a href="ftp://mirror.aarnet.edu.au/debian/">/debian/</a></td>
 <td valign=top><a href="http://mirror.aarnet.edu.au/debian/">/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>ftp.monash.edu.au</td>
@@ -388,19 +387,19 @@ Everything else you want to know about Debian mirrors:
 <td valign=top>mirror.pacific.net.au</td>
 <td valign=top><a href="ftp://mirror.pacific.net.au/debian/">/debian/</a></td>
 <td valign=top><a href="http://mirror.pacific.net.au/debian/">/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>ftp.iinet.net.au</td>
 <td valign=top><a href="ftp://ftp.iinet.net.au/debian/debian/">/debian/debian/</a></td>
 <td valign=top><a href="http://ftp.iinet.net.au/debian/debian/">/debian/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>mirror.optus.net</td>
 <td valign=top><a href="ftp://mirror.optus.net/debian/">/debian/</a></td>
 <td valign=top><a href="http://mirror.optus.net/debian/">/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>mirror.cse.unsw.edu.au</td>
@@ -418,7 +417,17 @@ Everything else you want to know about Debian mirrors:
 <td valign=top>ftp.netspace.net.au</td>
 <td valign=top><a href="ftp://ftp.netspace.net.au/pub/debian/">/pub/debian/</a></td>
 <td valign=top><a href="http://ftp.netspace.net.au/pub/debian/">/pub/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
+</tr>
+
+<tr><td colspan=4><hr size=1></td></tr>
+<tr><td colspan=4><big><strong>BA Bosnia & Herzegovina</strong></big></td></tr>
+
+<tr>
+<td valign=top>mirror.debian.com.ba</td>
+<td valign=top><a href="ftp://mirror.debian.com.ba/debian/">/debian/</a></td>
+<td valign=top><a href="http://mirror.debian.com.ba/debian/">/debian/</a></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 
 <tr><td colspan=4><hr size=1></td></tr>
@@ -428,31 +437,31 @@ Everything else you want to know about Debian mirrors:
 <td valign=top>ftp.be.debian.org<br>  (ftp.belnet.be)</td>
 <td valign=top><a href="ftp://ftp.be.debian.org/debian/">/debian/</a></td>
 <td valign=top><a href="http://ftp.be.debian.org/debian/">/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>ftp.kulnet.kuleuven.ac.be</td>
 <td valign=top><a href="ftp://ftp.kulnet.kuleuven.ac.be/debian/">/debian/</a></td>
 <td valign=top><a href="http://ftp.kulnet.kuleuven.ac.be/debian/">/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>ftp.easynet.be</td>
 <td valign=top><a href="ftp://ftp.easynet.be/debian/">/debian/</a></td>
 <td valign=top><a href="http://ftp.easynet.be/ftp/debian/">/ftp/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>ftp.debian.skynet.be</td>
 <td valign=top><a href="ftp://ftp.debian.skynet.be/debian/">/debian/</a></td>
 <td valign=top><a href="http://ftp.debian.skynet.be/ftp/debian/">/ftp/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>mirror.be.gbxs.net</td>
 <td valign=top><a href="ftp://mirror.be.gbxs.net/debian/">/debian/</a></td>
 <td valign=top><a href="http://mirror.be.gbxs.net/debian/">/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 
 <tr><td colspan=4><hr size=1></td></tr>
@@ -462,7 +471,7 @@ Everything else you want to know about Debian mirrors:
 <td valign=top>ftp.bg.debian.org<br>  (debian.spnet.net)</td>
 <td valign=top><a href="ftp://ftp.bg.debian.org/debian/">/debian/</a></td>
 <td valign=top><a href="http://ftp.bg.debian.org/debian/">/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>debian.ludost.net</td>
@@ -474,13 +483,13 @@ Everything else you want to know about Debian mirrors:
 <td valign=top>ftp.uni-sofia.bg</td>
 <td valign=top><a href="ftp://ftp.uni-sofia.bg/debian/">/debian/</a></td>
 <td valign=top><a href="http://ftp.uni-sofia.bg/debian/">/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>debian.telecoms.bg</td>
 <td valign=top><a href="ftp://debian.telecoms.bg/debian/">/debian/</a></td>
 <td valign=top><a href="http://debian.telecoms.bg/debian/">/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>debian.mnet.bg</td>
@@ -492,7 +501,7 @@ Everything else you want to know about Debian mirrors:
 <td valign=top>debian.networx-bg.com</td>
 <td valign=top><a href="ftp://debian.networx-bg.com/debian/">/debian/</a></td>
 <td valign=top><a href="http://debian.networx-bg.com/debian/">/debian/</a></td>
-<td valign=top><small><small>amd64 i386</small></small></td>
+<td valign=top><small><small>amd64 armel i386</small></small></td>
 </tr>
 
 <tr><td colspan=4><hr size=1></td></tr>
@@ -502,7 +511,7 @@ Everything else you want to know about Debian mirrors:
 <td valign=top>ftp.br.debian.org<br>  (debian.c3sl.ufpr.br)</td>
 <td valign=top><a href="ftp://ftp.br.debian.org/debian/">/debian/</a></td>
 <td valign=top><a href="http://ftp.br.debian.org/debian/">/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>debian.das.ufsc.br</td>
@@ -514,13 +523,13 @@ Everything else you want to know about Debian mirrors:
 <td valign=top>download.unesp.br</td>
 <td></td>
 <td valign=top><a href="http://download.unesp.br/linux/debian/">/linux/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>sft.if.usp.br</td>
 <td></td>
 <td valign=top><a href="http://sft.if.usp.br/debian/">/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>linorg.usp.br</td>
@@ -558,7 +567,7 @@ Everything else you want to know about Debian mirrors:
 
 <tr>
 <td valign=top>linux.org.by</td>
-<td valign=top><a href="ftp://linux.org.by/debian/">/debian/</a></td>
+<td></td>
 <td valign=top><a href="http://linux.org.by/debian/">/debian/</a></td>
 <td valign=top><small><small>amd64 i386</small></small></td>
 </tr>
@@ -576,7 +585,7 @@ Everything else you want to know about Debian mirrors:
 <td valign=top>ftp.ca.debian.org</td>
 <td valign=top><a href="ftp://ftp.ca.debian.org/debian/">/debian/</a></td>
 <td valign=top><a href="http://ftp.ca.debian.org/debian/">/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>debian.yorku.ca</td>
@@ -588,31 +597,31 @@ Everything else you want to know about Debian mirrors:
 <td valign=top>ftp3.nrc.ca</td>
 <td valign=top><a href="ftp://ftp3.nrc.ca/debian/">/debian/</a></td>
 <td valign=top><a href="http://ftp3.nrc.ca/debian/">/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>gulus.usherbrooke.ca</td>
 <td valign=top><a href="ftp://gulus.usherbrooke.ca/debian/">/debian/</a></td>
 <td valign=top><a href="http://gulus.usherbrooke.ca/debian/">/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>mirror.cpsc.ucalgary.ca</td>
-<td valign=top><a href="ftp://mirror.cpsc.ucalgary.ca/mirror/debian.org/debian/">/mirror/debian.org/debian/</a></td>
+<td valign=top><a href="ftp://mirror.cpsc.ucalgary.ca/debian/">/debian/</a></td>
 <td valign=top><a href="http://mirror.cpsc.ucalgary.ca/mirror/debian.org/debian/">/mirror/debian.org/debian/</a></td>
-<td valign=top><small><small>amd64 i386</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>mirror.peer1.net</td>
 <td></td>
 <td valign=top><a href="http://mirror.peer1.net/debian/">/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel i386 mips mipsel powerpc sparc</small></small></td>
+<td valign=top><small><small>amd64 i386</small></small></td>
 </tr>
 <tr>
 <td valign=top>debian.mirror.rafal.ca</td>
 <td valign=top><a href="ftp://debian.mirror.rafal.ca/debian/">/debian/</a></td>
 <td valign=top><a href="http://debian.mirror.rafal.ca/debian/">/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>debian.savoirfairelinux.net</td>
@@ -624,7 +633,7 @@ Everything else you want to know about Debian mirrors:
 <td valign=top>debian.mirror.iweb.ca</td>
 <td valign=top><a href="ftp://debian.mirror.iweb.ca/debian/">/debian/</a></td>
 <td valign=top><a href="http://debian.mirror.iweb.ca/debian/">/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>mirror.publicns.net</td>
@@ -636,7 +645,7 @@ Everything else you want to know about Debian mirrors:
 <td valign=top>mirror.csclub.uwaterloo.ca</td>
 <td valign=top><a href="ftp://mirror.csclub.uwaterloo.ca/debian/">/debian/</a></td>
 <td valign=top><a href="http://mirror.csclub.uwaterloo.ca/debian/">/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 
 <tr><td colspan=4><hr size=1></td></tr>
@@ -646,13 +655,13 @@ Everything else you want to know about Debian mirrors:
 <td valign=top>ftp.ch.debian.org<br>  (debian.ethz.ch)</td>
 <td valign=top><a href="ftp://ftp.ch.debian.org/debian/">/debian/</a></td>
 <td valign=top><a href="http://ftp.ch.debian.org/debian/">/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>mirror.switch.ch</td>
 <td valign=top><a href="ftp://mirror.switch.ch/mirror/debian/">/mirror/debian/</a></td>
 <td valign=top><a href="http://mirror.switch.ch/ftp/mirror/debian/">/ftp/mirror/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>debian.csg.uzh.ch</td>
@@ -668,7 +677,7 @@ Everything else you want to know about Debian mirrors:
 <td valign=top>ftp.cl.debian.org<br>  (debian.ciencias.uchile.cl)</td>
 <td valign=top><a href="ftp://ftp.cl.debian.org/debian/">/debian/</a></td>
 <td valign=top><a href="http://ftp.cl.debian.org/debian/">/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>debian.ubiobio.cl</td>
@@ -689,10 +698,10 @@ Everything else you want to know about Debian mirrors:
 <td valign=top><small><small>amd64 i386</small></small></td>
 </tr>
 <tr>
-<td valign=top>mirror.debianchile.cl</td>
-<td></td>
-<td valign=top><a href="http://mirror.debianchile.cl/debian/">/debian/</a></td>
-<td valign=top><small><small>amd64 i386</small></small></td>
+<td valign=top>debian.netlinux.cl</td>
+<td valign=top><a href="ftp://debian.netlinux.cl/debian/">/debian/</a></td>
+<td valign=top><a href="http://debian.netlinux.cl/debian/">/debian/</a></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390</small></small></td>
 </tr>
 
 <tr><td colspan=4><hr size=1></td></tr>
@@ -702,19 +711,13 @@ Everything else you want to know about Debian mirrors:
 <td valign=top>mirrors.geekbone.org</td>
 <td valign=top><a href="ftp://mirrors.geekbone.org/debian/">/debian/</a></td>
 <td valign=top><a href="http://mirrors.geekbone.org/debian/">/debian/</a></td>
-<td valign=top><small><small>alpha amd64 hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
-</tr>
-<tr>
-<td valign=top>debian.cn99.com</td>
-<td valign=top><a href="ftp://debian.cn99.com/debian/">/debian/</a></td>
-<td valign=top><a href="http://debian.cn99.com/debian/">/debian/</a></td>
-<td valign=top><small><small>amd64 i386</small></small></td>
+<td valign=top><small><small>alpha amd64 hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>www.anheng.com.cn</td>
 <td valign=top><a href="ftp://www.anheng.com.cn/debian/">/debian/</a></td>
 <td valign=top><a href="http://www.anheng.com.cn/debian/">/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 
 <tr><td colspan=4><hr size=1></td></tr>
@@ -724,13 +727,13 @@ Everything else you want to know about Debian mirrors:
 <td valign=top>ftp.cz.debian.org<br>  (ftp.debian.cz)</td>
 <td valign=top><a href="ftp://ftp.cz.debian.org/debian/">/debian/</a></td>
 <td valign=top><a href="http://ftp.cz.debian.org/debian/">/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>debian.sh.cvut.cz</td>
 <td valign=top><a href="ftp://debian.sh.cvut.cz/debian/">/debian/</a></td>
 <td valign=top><a href="http://debian.sh.cvut.cz/debian/">/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>ftp.zcu.cz</td>
@@ -754,7 +757,7 @@ Everything else you want to know about Debian mirrors:
 <td valign=top>debian.ignum.cz</td>
 <td valign=top><a href="ftp://debian.ignum.cz/debian/">/debian/</a></td>
 <td valign=top><a href="http://debian.ignum.cz/debian/">/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 
 <tr><td colspan=4><hr size=1></td></tr>
@@ -764,31 +767,31 @@ Everything else you want to know about Debian mirrors:
 <td valign=top>ftp.de.debian.org<br>  (debian.inf.tu-dresden.de)</td>
 <td valign=top><a href="ftp://ftp.de.debian.org/debian/">/debian/</a></td>
 <td valign=top><a href="http://ftp.de.debian.org/debian/">/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>ftp2.de.debian.org<br>  (ftp.rfc822.org)</td>
 <td valign=top><a href="ftp://ftp2.de.debian.org/debian/">/debian/</a></td>
 <td valign=top><a href="http://ftp2.de.debian.org/debian/">/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>ftp.tu-clausthal.de</td>
 <td valign=top><a href="ftp://ftp.tu-clausthal.de/pub/linux/debian/">/pub/linux/debian/</a></td>
 <td></td>
-<td valign=top><small><small>amd64 arm armel i386 ia64 m68k mips powerpc sparc</small></small></td>
+<td valign=top><small><small>amd64 arm armel i386 ia64 mips powerpc sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>debian.uni-duisburg-essen.de</td>
 <td valign=top><a href="ftp://debian.uni-duisburg-essen.de/debian/">/debian/</a></td>
 <td valign=top><a href="http://debian.uni-duisburg-essen.de/debian/">/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>ftp.freenet.de</td>
 <td valign=top><a href="ftp://ftp.freenet.de/debian/">/debian/</a></td>
 <td valign=top><a href="http://ftp.freenet.de/debian/">/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>ftp.informatik.rwth-aachen.de</td>
@@ -800,7 +803,7 @@ Everything else you want to know about Debian mirrors:
 <td valign=top>ftp-stud.fht-esslingen.de</td>
 <td valign=top><a href="ftp://ftp-stud.fht-esslingen.de/debian/">/debian/</a></td>
 <td valign=top><a href="http://ftp-stud.fht-esslingen.de/debian/">/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>ftp.stw-bonn.de</td>
@@ -812,13 +815,13 @@ Everything else you want to know about Debian mirrors:
 <td valign=top>ftp.fu-berlin.de</td>
 <td valign=top><a href="ftp://ftp.fu-berlin.de/pub/unix/linux/mirrors/debian/">/pub/unix/linux/mirrors/debian/</a></td>
 <td></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>debian.tu-bs.de</td>
 <td valign=top><a href="ftp://debian.tu-bs.de/debian/">/debian/</a></td>
 <td valign=top><a href="http://debian.tu-bs.de/debian/">/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>ftp.uni-koeln.de</td>
@@ -830,19 +833,13 @@ Everything else you want to know about Debian mirrors:
 <td valign=top>ftp.mpi-sb.mpg.de</td>
 <td valign=top><a href="ftp://ftp.mpi-sb.mpg.de/pub/linux/debian/">/pub/linux/debian/</a></td>
 <td></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
-</tr>
-<tr>
-<td valign=top>ftp.tiscali.de</td>
-<td valign=top><a href="ftp://ftp.tiscali.de/pub/debian/debian/">/pub/debian/debian/</a></td>
-<td valign=top><a href="http://ftp.tiscali.de/pub/debian/debian/">/pub/debian/debian/</a></td>
-<td valign=top><small><small>amd64 arm armel hurd-i386 i386 ia64</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>ftp.tu-chemnitz.de</td>
 <td valign=top><a href="ftp://ftp.tu-chemnitz.de/pub/linux/debian/debian/">/pub/linux/debian/debian/</a></td>
 <td valign=top><a href="http://ftp.tu-chemnitz.de/pub/linux/debian/debian/">/pub/linux/debian/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>ftp.uni-kl.de</td>
@@ -854,25 +851,25 @@ Everything else you want to know about Debian mirrors:
 <td valign=top>ftp.uni-bayreuth.de</td>
 <td valign=top><a href="ftp://ftp.uni-bayreuth.de/debian/">/debian/</a></td>
 <td valign=top><a href="http://ftp.uni-bayreuth.de/debian/">/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>ftp.informatik.hu-berlin.de</td>
 <td valign=top><a href="ftp://ftp.informatik.hu-berlin.de/pub/Linux/debian/">/pub/Linux/debian/</a></td>
 <td></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>ftp5.gwdg.de</td>
 <td valign=top><a href="ftp://ftp5.gwdg.de/pub/linux/debian/debian/">/pub/linux/debian/debian/</a></td>
 <td valign=top><a href="http://ftp5.gwdg.de/pub/linux/debian/debian/">/pub/linux/debian/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>ftp.hosteurope.de</td>
 <td valign=top><a href="ftp://ftp.hosteurope.de/pub/linux/debian/">/pub/linux/debian/</a></td>
 <td valign=top><a href="http://ftp.hosteurope.de/pub/linux/debian/">/pub/linux/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>ftp.informatik.uni-frankfurt.de</td>
@@ -884,7 +881,7 @@ Everything else you want to know about Debian mirrors:
 <td valign=top>debian.netcologne.de</td>
 <td valign=top><a href="ftp://debian.netcologne.de/debian/">/debian/</a></td>
 <td valign=top><a href="http://debian.netcologne.de/debian/">/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>artfiles.org</td>
@@ -896,7 +893,7 @@ Everything else you want to know about Debian mirrors:
 <td valign=top>debian.intergenia.de</td>
 <td></td>
 <td valign=top><a href="http://debian.intergenia.de/debian/">/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>debian.cruisix.net</td>
@@ -908,7 +905,7 @@ Everything else you want to know about Debian mirrors:
 <td valign=top>ftp.rrzn.uni-hannover.de</td>
 <td valign=top><a href="ftp://ftp.rrzn.uni-hannover.de/debian/debian/">/debian/debian/</a></td>
 <td></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>amd64 i386 ia64</small></small></td>
 </tr>
 <tr>
 <td valign=top>debian.charite.de</td>
@@ -920,19 +917,13 @@ Everything else you want to know about Debian mirrors:
 <td valign=top>ftp.plusline.de</td>
 <td valign=top><a href="ftp://ftp.plusline.de/pub/debian/">/pub/debian/</a></td>
 <td valign=top><a href="http://ftp.plusline.de/debian/">/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
-<td valign=top>sinclair.farm.ftbfs.de</td>
-<td></td>
-<td valign=top><a href="http://sinclair.farm.ftbfs.de/debian/">/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
-</tr>
-<tr>
-<td valign=top>ftp.halifax.rwth-aachen.de</td>
-<td valign=top><a href="ftp://ftp.halifax.rwth-aachen.de/debian/">/debian/</a></td>
-<td valign=top><a href="http://ftp.halifax.rwth-aachen.de/debian/">/debian/</a></td>
-<td valign=top><small><small>amd64 i386</small></small></td>
+<td valign=top>mirror.ayous.org</td>
+<td valign=top><a href="ftp://mirror.ayous.org/debian/">/debian/</a></td>
+<td valign=top><a href="http://mirror.ayous.org/debian/">/debian/</a></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 
 <tr><td colspan=4><hr size=1></td></tr>
@@ -942,19 +933,13 @@ Everything else you want to know about Debian mirrors:
 <td valign=top>ftp.dk.debian.org<br>  (mirrors.dotsrc.org)</td>
 <td valign=top><a href="ftp://ftp.dk.debian.org/debian/">/debian/</a></td>
 <td valign=top><a href="http://ftp.dk.debian.org/debian/">/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>ftp.dkuug.dk</td>
 <td valign=top><a href="ftp://ftp.dkuug.dk/pub/debian/">/pub/debian/</a></td>
 <td valign=top><a href="http://ftp.dkuug.dk/debian/">/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
-</tr>
-<tr>
-<td valign=top>mirror.here.dk</td>
-<td valign=top><a href="ftp://mirror.here.dk/debian/">/debian/</a></td>
-<td valign=top><a href="http://mirror.here.dk/debian/">/debian/</a></td>
-<td valign=top><small><small>amd64 i386 ia64 mips powerpc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>debian.uni-c.dk</td>
@@ -972,7 +957,7 @@ Everything else you want to know about Debian mirrors:
 <td valign=top>debianmirror.wwi.dk</td>
 <td></td>
 <td valign=top><a href="http://debianmirror.wwi.dk/debian/">/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 
 <tr><td colspan=4><hr size=1></td></tr>
@@ -982,17 +967,17 @@ Everything else you want to know about Debian mirrors:
 <td valign=top>ftp.ee.debian.org<br>  (ftp.aso.ee)</td>
 <td valign=top><a href="ftp://ftp.ee.debian.org/debian/">/debian/</a></td>
 <td valign=top><a href="http://ftp.ee.debian.org/debian/">/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 
 <tr><td colspan=4><hr size=1></td></tr>
 <tr><td colspan=4><big><strong>ES Spain</strong></big></td></tr>
 
 <tr>
-<td valign=top>ftp.es.debian.org<br>  (ulises.hostalia.com)</td>
+<td valign=top>ftp.es.debian.org<br>  (ftp.gul.uc3m.es)</td>
 <td valign=top><a href="ftp://ftp.es.debian.org/debian/">/debian/</a></td>
 <td valign=top><a href="http://ftp.es.debian.org/debian/">/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>ftp.rediris.es</td>
@@ -1004,25 +989,19 @@ Everything else you want to know about Debian mirrors:
 <td valign=top>ftp.cica.es</td>
 <td valign=top><a href="ftp://ftp.cica.es/debian/">/debian/</a></td>
 <td valign=top><a href="http://ftp.cica.es/debian/">/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>amd64 i386 ia64 powerpc</small></small></td>
 </tr>
 <tr>
 <td valign=top>ftp.caliu.cat</td>
 <td valign=top><a href="ftp://ftp.caliu.cat/debian/">/debian/</a></td>
 <td valign=top><a href="http://ftp.caliu.cat/debian/">/debian/</a></td>
-<td valign=top><small><small>amd64 i386 ia64 powerpc</small></small></td>
+<td valign=top><small><small>amd64 armel i386 ia64 powerpc</small></small></td>
 </tr>
 <tr>
 <td valign=top>ftp.gva.es</td>
 <td valign=top><a href="ftp://ftp.gva.es/mirror/debian/">/mirror/debian/</a></td>
 <td valign=top><a href="http://ftp.gva.es/mirror/debian/">/mirror/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
-</tr>
-<tr>
-<td valign=top>ftp.gul.uc3m.es</td>
-<td valign=top><a href="ftp://ftp.gul.uc3m.es/debian/">/debian/</a></td>
-<td valign=top><a href="http://ftp.gul.uc3m.es/debian/">/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>ftp.um.es</td>
@@ -1031,16 +1010,10 @@ Everything else you want to know about Debian mirrors:
 <td valign=top><small><small>i386</small></small></td>
 </tr>
 <tr>
-<td valign=top>jane.uab.cat</td>
-<td valign=top><a href="ftp://jane.uab.cat/debian/">/debian/</a></td>
-<td valign=top><a href="http://jane.uab.cat/debian/">/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
-</tr>
-<tr>
 <td valign=top>ftp.udc.es</td>
 <td valign=top><a href="ftp://ftp.udc.es/debian/">/debian/</a></td>
 <td valign=top><a href="http://ftp.udc.es/debian/">/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>debian.grn.cat</td>
@@ -1050,9 +1023,9 @@ Everything else you want to know about Debian mirrors:
 </tr>
 <tr>
 <td valign=top>debian.com.es</td>
-<td valign=top><a href="ftp://debian.com.es/debian/">/debian/</a></td>
+<td></td>
 <td valign=top><a href="http://debian.com.es/debian/">/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 
 <tr><td colspan=4><hr size=1></td></tr>
@@ -1062,13 +1035,13 @@ Everything else you want to know about Debian mirrors:
 <td valign=top>ftp.fi.debian.org<br>  (trumpetti.atm.tut.fi)</td>
 <td valign=top><a href="ftp://ftp.fi.debian.org/debian/">/debian/</a></td>
 <td valign=top><a href="http://ftp.fi.debian.org/debian/">/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>ftp.funet.fi</td>
 <td valign=top><a href="ftp://ftp.funet.fi/pub/linux/mirrors/debian/">/pub/linux/mirrors/debian/</a></td>
 <td valign=top><a href="http://ftp.funet.fi/pub/linux/mirrors/debian/">/pub/linux/mirrors/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>ftp.jyu.fi</td>
@@ -1090,31 +1063,31 @@ Everything else you want to know about Debian mirrors:
 <td valign=top>ftp.fr.debian.org<br>  (debian.proxad.net)</td>
 <td valign=top><a href="ftp://ftp.fr.debian.org/debian/">/debian/</a></td>
 <td valign=top><a href="http://ftp.fr.debian.org/debian/">/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>ftp2.fr.debian.org<br>  (ftp.oleane.net)</td>
 <td valign=top><a href="ftp://ftp2.fr.debian.org/debian/">/debian/</a></td>
 <td valign=top><a href="http://ftp2.fr.debian.org/debian/">/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>ftp.iut-bm.univ-fcomte.fr</td>
 <td valign=top><a href="ftp://ftp.iut-bm.univ-fcomte.fr/debian/">/debian/</a></td>
 <td valign=top><a href="http://ftp.iut-bm.univ-fcomte.fr/debian/">/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>ftp.eudil.fr</td>
 <td valign=top><a href="ftp://ftp.eudil.fr/debian/">/debian/</a></td>
 <td valign=top><a href="http://ftp.eudil.fr/debian/">/debian/</a></td>
-<td valign=top><small><small>alpha arm armel hppa i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>ftp.proxad.net</td>
 <td valign=top><a href="ftp://ftp.proxad.net/mirrors/ftp.debian.org/">/mirrors/ftp.debian.org/</a></td>
 <td></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>ftp.lip6.fr</td>
@@ -1126,25 +1099,25 @@ Everything else you want to know about Debian mirrors:
 <td valign=top>debian.ens-cachan.fr</td>
 <td valign=top><a href="ftp://debian.ens-cachan.fr/debian/">/debian/</a></td>
 <td valign=top><a href="http://debian.ens-cachan.fr/ftp/debian/">/ftp/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>ftp.u-picardie.fr</td>
 <td valign=top><a href="ftp://ftp.u-picardie.fr/mirror/debian/">/mirror/debian/</a></td>
 <td valign=top><a href="http://ftp.u-picardie.fr/mirror/debian/">/mirror/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>debian.mirrors.easynet.fr</td>
 <td valign=top><a href="ftp://debian.mirrors.easynet.fr/debian/">/debian/</a></td>
 <td valign=top><a href="http://debian.mirrors.easynet.fr/">/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>ftp.u-strasbg.fr</td>
 <td valign=top><a href="ftp://ftp.u-strasbg.fr/debian/">/debian/</a></td>
 <td valign=top><a href="http://ftp.u-strasbg.fr/debian/">/debian/</a></td>
-<td valign=top><small><small>alpha amd64 hurd-i386 i386 ia64 m68k powerpc sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 armel hurd-i386 i386 ia64 powerpc sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>debian.cict.fr</td>
@@ -1156,13 +1129,13 @@ Everything else you want to know about Debian mirrors:
 <td valign=top>mir1.ovh.net</td>
 <td valign=top><a href="ftp://mir1.ovh.net/debian/">/debian/</a></td>
 <td valign=top><a href="http://mir1.ovh.net/debian/">/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>mir2.ovh.net</td>
 <td></td>
 <td valign=top><a href="http://mir2.ovh.net/debian/">/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>ftp.nerim.net</td>
@@ -1174,31 +1147,25 @@ Everything else you want to know about Debian mirrors:
 <td valign=top>ftp.crihan.fr</td>
 <td valign=top><a href="ftp://ftp.crihan.fr/debian/">/debian/</a></td>
 <td valign=top><a href="http://ftp.crihan.fr/debian/">/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>debian.mines.inpl-nancy.fr</td>
 <td valign=top><a href="ftp://debian.mines.inpl-nancy.fr/debian/">/debian/</a></td>
 <td valign=top><a href="http://debian.mines.inpl-nancy.fr/debian/">/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
-</tr>
-<tr>
-<td valign=top>ftp.debian.ikoula.com</td>
-<td valign=top><a href="ftp://ftp.debian.ikoula.com/debian/">/debian/</a></td>
-<td></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>webb.ens-cachan.fr</td>
 <td valign=top><a href="ftp://webb.ens-cachan.fr/debian/">/debian/</a></td>
 <td valign=top><a href="http://webb.ens-cachan.fr/debian/">/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>mirrors.ircam.fr</td>
 <td valign=top><a href="ftp://mirrors.ircam.fr/pub/debian/">/pub/debian/</a></td>
 <td valign=top><a href="http://mirrors.ircam.fr/pub/debian/">/pub/debian/</a></td>
-<td valign=top><small><small>alpha amd64 hurd-i386 i386 ia64 m68k mips mipsel powerpc sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 hurd-i386 i386 ia64 mips mipsel powerpc sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>debian.mirror.inra.fr</td>
@@ -1210,7 +1177,7 @@ Everything else you want to know about Debian mirrors:
 <td valign=top>debian.med.univ-tours.fr</td>
 <td valign=top><a href="ftp://debian.med.univ-tours.fr/debian/">/debian/</a></td>
 <td valign=top><a href="http://debian.med.univ-tours.fr/debian/">/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>ftp.univ-pau.fr</td>
@@ -1222,19 +1189,13 @@ Everything else you want to know about Debian mirrors:
 <td valign=top>ftp.univ-nantes.fr</td>
 <td valign=top><a href="ftp://ftp.univ-nantes.fr/debian/">/debian/</a></td>
 <td></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>mirrors.compuscene.org</td>
 <td></td>
 <td valign=top><a href="http://mirrors.compuscene.org/debian/">/debian/</a></td>
-<td valign=top><small><small>amd64 i386</small></small></td>
-</tr>
-<tr>
-<td valign=top>debian.revolsys.fr</td>
-<td valign=top><a href="ftp://debian.revolsys.fr/debian/">/debian/</a></td>
-<td valign=top><a href="http://debian.revolsys.fr/debian/">/debian/</a></td>
-<td valign=top><small><small>amd64 i386</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>debian.univ-reims.fr</td>
@@ -1250,31 +1211,31 @@ Everything else you want to know about Debian mirrors:
 <td valign=top>ftp.uk.debian.org<br>  (debian.hands.com)</td>
 <td valign=top><a href="ftp://ftp.uk.debian.org/debian/">/debian/</a></td>
 <td valign=top><a href="http://ftp.uk.debian.org/debian/">/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>debian.man.ac.uk</td>
 <td></td>
 <td valign=top><a href="http://debian.man.ac.uk/debian/">/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>amd64 hurd-i386 i386</small></small></td>
 </tr>
 <tr>
 <td valign=top>www.mirrorservice.org</td>
 <td valign=top><a href="ftp://www.mirrorservice.org/sites/ftp.debian.org/debian/">/sites/ftp.debian.org/debian/</a></td>
 <td valign=top><a href="http://www.mirrorservice.org/sites/ftp.debian.org/debian/">/sites/ftp.debian.org/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>ftp.ticklers.org</td>
 <td valign=top><a href="ftp://ftp.ticklers.org/debian/">/debian/</a></td>
 <td valign=top><a href="http://ftp.ticklers.org/debian/">/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>debian.virginmedia.com</td>
 <td valign=top><a href="ftp://debian.virginmedia.com/mirrors/ftp.debian.org">/mirrors/ftp.debian.org</a></td>
 <td valign=top><a href="http://debian.virginmedia.com/">/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>mirror.positive-internet.com</td>
@@ -1292,13 +1253,13 @@ Everything else you want to know about Debian mirrors:
 <td valign=top>ukdebian.mirror.anlx.net</td>
 <td valign=top><a href="ftp://ukdebian.mirror.anlx.net/debian/">/debian/</a></td>
 <td valign=top><a href="http://ukdebian.mirror.anlx.net/debian/">/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>mirror.ox.ac.uk</td>
 <td valign=top><a href="ftp://mirror.ox.ac.uk/debian/">/debian/</a></td>
 <td valign=top><a href="http://mirror.ox.ac.uk/debian/">/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>debian.zetnet.co.uk</td>
@@ -1306,6 +1267,12 @@ Everything else you want to know about Debian mirrors:
 <td valign=top><a href="http://debian.zetnet.co.uk/debian/">/debian/</a></td>
 <td valign=top><small><small>amd64 i386 mipsel</small></small></td>
 </tr>
+<tr>
+<td valign=top>mirror.sov.uk.goscomb.net</td>
+<td valign=top><a href="ftp://mirror.sov.uk.goscomb.net/debian/">/debian/</a></td>
+<td valign=top><a href="http://mirror.sov.uk.goscomb.net/debian/">/debian/</a></td>
+<td valign=top><small><small>amd64 i386</small></small></td>
+</tr>
 
 <tr><td colspan=4><hr size=1></td></tr>
 <tr><td colspan=4><big><strong>GE Georgia</strong></big></td></tr>
@@ -1324,31 +1291,31 @@ Everything else you want to know about Debian mirrors:
 <td valign=top>ftp.gr.debian.org<br>  (ftp.ntua.gr)</td>
 <td valign=top><a href="ftp://ftp.gr.debian.org/debian/">/debian/</a></td>
 <td valign=top><a href="http://ftp.gr.debian.org/debian/">/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>debian.otenet.gr</td>
 <td valign=top><a href="ftp://debian.otenet.gr/pub/linux/debian/">/pub/linux/debian/</a></td>
 <td valign=top><a href="http://debian.otenet.gr/debian/">/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>ftp.duth.gr</td>
 <td valign=top><a href="ftp://ftp.duth.gr/debian/">/debian/</a></td>
 <td valign=top><a href="http://ftp.duth.gr/debian/">/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>ftp.softnet.tuc.gr</td>
-<td valign=top><a href="ftp://ftp.softnet.tuc.gr/pub/linux/debian/">/pub/linux/debian/</a></td>
+<td></td>
 <td valign=top><a href="http://ftp.softnet.tuc.gr/ftp/linux/debian/">/ftp/linux/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>ftp.cc.uoc.gr</td>
 <td valign=top><a href="ftp://ftp.cc.uoc.gr/mirrors/linux/debian/">/mirrors/linux/debian/</a></td>
 <td valign=top><a href="http://ftp.cc.uoc.gr/mirrors/linux/debian/">/mirrors/linux/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 
 <tr><td colspan=4><hr size=1></td></tr>
@@ -1360,12 +1327,6 @@ Everything else you want to know about Debian mirrors:
 <td valign=top><a href="http://ftp.hk.debian.org/debian/">/debian/</a></td>
 <td valign=top><small><small>alpha amd64 arm armel i386 ia64 powerpc sparc</small></small></td>
 </tr>
-<tr>
-<td valign=top>www.zentek-international.com</td>
-<td></td>
-<td valign=top><a href="http://www.zentek-international.com/mirrors/debian/">/mirrors/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
-</tr>
 
 <tr><td colspan=4><hr size=1></td></tr>
 <tr><td colspan=4><big><strong>HR Croatia</strong></big></td></tr>
@@ -1374,19 +1335,19 @@ Everything else you want to know about Debian mirrors:
 <td valign=top>ftp.hr.debian.org<br>  (debian.carnet.hr)</td>
 <td valign=top><a href="ftp://ftp.hr.debian.org/debian/">/debian/</a></td>
 <td valign=top><a href="http://ftp.hr.debian.org/debian/">/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>ftp.irb.hr</td>
 <td valign=top><a href="ftp://ftp.irb.hr/debian/">/debian/</a></td>
 <td valign=top><a href="http://ftp.irb.hr/debian/">/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>ftp.carnet.hr</td>
 <td valign=top><a href="ftp://ftp.carnet.hr/debian/">/debian/</a></td>
 <td valign=top><a href="http://ftp.carnet.hr/debian/">/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>debian.iskon.hr</td>
@@ -1402,13 +1363,13 @@ Everything else you want to know about Debian mirrors:
 <td valign=top>ftp.hu.debian.org<br>  (ftp.fsn.hu)</td>
 <td valign=top><a href="ftp://ftp.hu.debian.org/debian/">/debian/</a></td>
 <td valign=top><a href="http://ftp.hu.debian.org/debian/">/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>ftp.kfki.hu</td>
 <td valign=top><a href="ftp://ftp.kfki.hu/pub/linux/debian/">/pub/linux/debian/</a></td>
 <td valign=top><a href="http://ftp.kfki.hu/linux/debian/">/linux/debian/</a></td>
-<td valign=top><small><small>alpha arm armel hppa i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>ftp.bme.hu</td>
@@ -1420,7 +1381,7 @@ Everything else you want to know about Debian mirrors:
 <td valign=top>debian.mirrors.crysys.hu</td>
 <td valign=top><a href="ftp://debian.mirrors.crysys.hu/debian/">/debian/</a></td>
 <td valign=top><a href="http://debian.mirrors.crysys.hu/debian/">/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>debian.sth.sze.hu</td>
@@ -1439,10 +1400,10 @@ Everything else you want to know about Debian mirrors:
 <td valign=top><small><small>amd64 hurd-i386 i386 powerpc</small></small></td>
 </tr>
 <tr>
-<td valign=top>debian.indika.net.id</td>
-<td></td>
-<td valign=top><a href="http://debian.indika.net.id/debian/">/debian/</a></td>
-<td valign=top><small><small>i386</small></small></td>
+<td valign=top>mirror.unej.ac.id</td>
+<td valign=top><a href="ftp://mirror.unej.ac.id/debian/">/debian/</a></td>
+<td valign=top><a href="http://mirror.unej.ac.id/debian/">/debian/</a></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 
 <tr><td colspan=4><hr size=1></td></tr>
@@ -1452,13 +1413,13 @@ Everything else you want to know about Debian mirrors:
 <td valign=top>ftp.ie.debian.org<br>  (debian.heanet.ie)</td>
 <td valign=top><a href="ftp://ftp.ie.debian.org/debian/">/debian/</a></td>
 <td valign=top><a href="http://ftp.ie.debian.org/debian/">/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>ftp.esat.net</td>
 <td valign=top><a href="ftp://ftp.esat.net/pub/linux/debian/">/pub/linux/debian/</a></td>
 <td valign=top><a href="http://ftp.esat.net/pub/linux/debian/">/pub/linux/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 
 <tr><td colspan=4><hr size=1></td></tr>
@@ -1494,7 +1455,7 @@ Everything else you want to know about Debian mirrors:
 <td valign=top>ftp.is.debian.org<br>  (ftp.rhnet.is)</td>
 <td valign=top><a href="ftp://ftp.is.debian.org/debian/">/debian/</a></td>
 <td valign=top><a href="http://ftp.is.debian.org/debian/">/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 
 <tr><td colspan=4><hr size=1></td></tr>
@@ -1504,7 +1465,7 @@ Everything else you want to know about Debian mirrors:
 <td valign=top>ftp.it.debian.org<br>  (ftp.bofh.it)</td>
 <td valign=top><a href="ftp://ftp.it.debian.org/debian/">/debian/</a></td>
 <td valign=top><a href="http://ftp.it.debian.org/debian/">/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>giano.com.dist.unige.it</td>
@@ -1516,7 +1477,7 @@ Everything else you want to know about Debian mirrors:
 <td valign=top>ftp.bononia.it</td>
 <td valign=top><a href="ftp://ftp.bononia.it/debian/">/debian/</a></td>
 <td valign=top><a href="http://ftp.bononia.it/debian/">/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>freedom.dicea.unifi.it</td>
@@ -1525,28 +1486,22 @@ Everything else you want to know about Debian mirrors:
 <td valign=top><small><small>amd64 hurd-i386 i386</small></small></td>
 </tr>
 <tr>
-<td valign=top>ftp.eutelia.it</td>
-<td valign=top><a href="ftp://ftp.eutelia.it/pub/Debian_Mirror/">/pub/Debian_Mirror/</a></td>
-<td></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
-</tr>
-<tr>
 <td valign=top>mi.mirror.garr.it</td>
 <td valign=top><a href="ftp://mi.mirror.garr.it/mirrors/debian/">/mirrors/debian/</a></td>
 <td valign=top><a href="http://mi.mirror.garr.it/mirrors/debian/">/mirrors/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>debian.fastweb.it</td>
 <td valign=top><a href="ftp://debian.fastweb.it/debian/">/debian/</a></td>
 <td valign=top><a href="http://debian.fastweb.it/debian/">/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>ftp.unina.it</td>
 <td valign=top><a href="ftp://ftp.unina.it/pub/linux/distributions/debian/">/pub/linux/distributions/debian/</a></td>
 <td valign=top><a href="http://ftp.unina.it/pub/linux/distributions/debian/">/pub/linux/distributions/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>debian.fastbull.org</td>
@@ -1564,7 +1519,7 @@ Everything else you want to know about Debian mirrors:
 <td valign=top>mirror.units.it</td>
 <td></td>
 <td valign=top><a href="http://mirror.units.it/debian/">/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>amd64 i386</small></small></td>
 </tr>
 
 <tr><td colspan=4><hr size=1></td></tr>
@@ -1574,43 +1529,43 @@ Everything else you want to know about Debian mirrors:
 <td valign=top>ftp2.jp.debian.org<br>  (ftp.debian.or.jp)</td>
 <td valign=top><a href="ftp://ftp2.jp.debian.org/debian/">/debian/</a></td>
 <td valign=top><a href="http://ftp2.jp.debian.org/debian/">/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>ftp.jp.debian.org<br>  (dennou-q.gfd-dennou.org, dennou-k.gfd-dennou.org, dennou-h.gfd-dennou.org, debian.topstudio.co.jp, www.oyu-net.jp, hanzubon.jp, ftp.nara.wide.ad.jp, ftp2.jp.debian.org)</td>
 <td></td>
 <td valign=top><a href="http://ftp.jp.debian.org/debian/">/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>ftp.nara.wide.ad.jp</td>
 <td valign=top><a href="ftp://ftp.nara.wide.ad.jp/debian/">/debian/</a></td>
 <td valign=top><a href="http://ftp.nara.wide.ad.jp/debian/">/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
-</tr>
-<tr>
-<td valign=top>ring.asahi-net.or.jp</td>
-<td valign=top><a href="ftp://ring.asahi-net.or.jp/pub/linux/debian/debian/">/pub/linux/debian/debian/</a></td>
-<td valign=top><a href="http://ring.asahi-net.or.jp/archives/linux/debian/debian/">/archives/linux/debian/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>ftp.dti.ad.jp</td>
 <td valign=top><a href="ftp://ftp.dti.ad.jp/pub/Linux/debian/">/pub/Linux/debian/</a></td>
 <td valign=top><a href="http://ftp.dti.ad.jp/pub/Linux/debian/">/pub/Linux/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>dennou-k.gfd-dennou.org</td>
 <td valign=top><a href="ftp://dennou-k.gfd-dennou.org/debian/">/debian/</a></td>
 <td valign=top><a href="http://dennou-k.gfd-dennou.org/debian/">/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>dennou-q.gfd-dennou.org</td>
 <td valign=top><a href="ftp://dennou-q.gfd-dennou.org/debian/">/debian/</a></td>
 <td valign=top><a href="http://dennou-q.gfd-dennou.org/debian/">/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
+</tr>
+<tr>
+<td valign=top>ftp.yz.yamagata-u.ac.jp</td>
+<td valign=top><a href="ftp://ftp.yz.yamagata-u.ac.jp/debian/">/debian/</a></td>
+<td valign=top><a href="http://ftp.yz.yamagata-u.ac.jp/debian/">/debian/</a></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>sb.itc.u-tokyo.ac.jp</td>
@@ -1622,7 +1577,7 @@ Everything else you want to know about Debian mirrors:
 <td valign=top>ftp.riken.jp</td>
 <td valign=top><a href="ftp://ftp.riken.jp/Linux/debian/debian/">/Linux/debian/debian/</a></td>
 <td valign=top><a href="http://ftp.riken.jp/Linux/debian/debian/">/Linux/debian/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>debian.shimpinomori.net</td>
@@ -1631,16 +1586,10 @@ Everything else you want to know about Debian mirrors:
 <td valign=top><small><small>amd64 i386 powerpc</small></small></td>
 </tr>
 <tr>
-<td valign=top>www.ring.gr.jp</td>
-<td valign=top><a href="ftp://www.ring.gr.jp/pub/linux/debian/debian/">/pub/linux/debian/debian/</a></td>
-<td valign=top><a href="http://www.ring.gr.jp/archives/linux/debian/debian/">/archives/linux/debian/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
-</tr>
-<tr>
 <td valign=top>ftp.jaist.ac.jp</td>
 <td valign=top><a href="ftp://ftp.jaist.ac.jp/pub/Linux/Debian/">/pub/Linux/Debian/</a></td>
 <td valign=top><a href="http://ftp.jaist.ac.jp/pub/Linux/Debian/">/pub/Linux/Debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>www.cohsoft.com</td>
@@ -1652,7 +1601,7 @@ Everything else you want to know about Debian mirrors:
 <td valign=top>dennou-h.gfd-dennou.org</td>
 <td valign=top><a href="ftp://dennou-h.gfd-dennou.org/debian/">/debian/</a></td>
 <td valign=top><a href="http://dennou-h.gfd-dennou.org/debian/">/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 
 <tr><td colspan=4><hr size=1></td></tr>
@@ -1662,23 +1611,23 @@ Everything else you want to know about Debian mirrors:
 <td valign=top>ftp.kr.debian.org<br>  (ftp.kaist.ac.kr)</td>
 <td valign=top><a href="ftp://ftp.kr.debian.org/debian/">/debian/</a></td>
 <td valign=top><a href="http://ftp.kr.debian.org/debian/">/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>ftp.daum.net</td>
 <td valign=top><a href="ftp://ftp.daum.net/debian/">/debian/</a></td>
 <td valign=top><a href="http://ftp.daum.net/debian/">/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 
 <tr><td colspan=4><hr size=1></td></tr>
 <tr><td colspan=4><big><strong>LT Lithuania</strong></big></td></tr>
 
 <tr>
-<td valign=top>ameba.sc-uni.ktu.lt</td>
-<td valign=top><a href="ftp://ameba.sc-uni.ktu.lt/debian/">/debian/</a></td>
-<td valign=top><a href="http://ameba.sc-uni.ktu.lt/debian/">/debian/</a></td>
-<td valign=top><small><small>amd64 i386</small></small></td>
+<td valign=top>ftp.litnet.lt</td>
+<td valign=top><a href="ftp://ftp.litnet.lt/debian/">/debian/</a></td>
+<td valign=top><a href="http://ftp.litnet.lt/debian/">/debian/</a></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>debian.balt.net</td>
@@ -1714,12 +1663,12 @@ Everything else you want to know about Debian mirrors:
 <td valign=top>ftp.mx.debian.org<br>  (debian.unam.mx)</td>
 <td valign=top><a href="ftp://ftp.mx.debian.org/debian/">/debian/</a></td>
 <td valign=top><a href="http://ftp.mx.debian.org/debian/">/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
-<td valign=top>mmc.igeofcu.unam.mx</td>
-<td></td>
-<td valign=top><a href="http://mmc.igeofcu.unam.mx/debian/">/debian/</a></td>
+<td valign=top>mmc.geofisica.unam.mx</td>
+<td valign=top><a href="ftp://mmc.geofisica.unam.mx/debian/">/debian/</a></td>
+<td valign=top><a href="http://mmc.geofisica.unam.mx/debian/">/debian/</a></td>
 <td valign=top><small><small>amd64 hurd-i386 i386 ia64</small></small></td>
 </tr>
 
@@ -1750,31 +1699,31 @@ Everything else you want to know about Debian mirrors:
 <td valign=top>ftp.nl.debian.org<br>  (ftp.snt.utwente.nl)</td>
 <td valign=top><a href="ftp://ftp.nl.debian.org/debian/">/debian/</a></td>
 <td valign=top><a href="http://ftp.nl.debian.org/debian/">/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>ftp.nluug.nl</td>
 <td valign=top><a href="ftp://ftp.nluug.nl/pub/os/Linux/distr/debian/">/pub/os/Linux/distr/debian/</a></td>
 <td valign=top><a href="http://ftp.nluug.nl/pub/os/Linux/distr/debian/">/pub/os/Linux/distr/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>ftp.surfnet.nl</td>
 <td valign=top><a href="ftp://ftp.surfnet.nl/pub/os/Linux/distr/debian/">/pub/os/Linux/distr/debian/</a></td>
 <td valign=top><a href="http://ftp.surfnet.nl/os/Linux/distr/debian/">/os/Linux/distr/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>ftp.debian.nl</td>
 <td valign=top><a href="ftp://ftp.debian.nl/debian/">/debian/</a></td>
 <td valign=top><a href="http://ftp.debian.nl/debian/">/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>ftp.tiscali.nl</td>
 <td valign=top><a href="ftp://ftp.tiscali.nl/pub/mirrors/debian/">/pub/mirrors/debian/</a></td>
 <td valign=top><a href="http://ftp.tiscali.nl/debian/">/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 
 <tr><td colspan=4><hr size=1></td></tr>
@@ -1794,13 +1743,7 @@ Everything else you want to know about Debian mirrors:
 <td valign=top>ftp.nz.debian.org<br>  (ftp.citylink.co.nz)</td>
 <td valign=top><a href="ftp://ftp.nz.debian.org/debian/">/debian/</a></td>
 <td valign=top><a href="http://ftp.nz.debian.org/debian/">/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
-</tr>
-<tr>
-<td valign=top>debian.ihug.co.nz</td>
-<td valign=top><a href="ftp://debian.ihug.co.nz/debian/">/debian/</a></td>
-<td valign=top><a href="http://debian.ihug.co.nz/debian/">/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 
 <tr><td colspan=4><hr size=1></td></tr>
@@ -1820,19 +1763,19 @@ Everything else you want to know about Debian mirrors:
 <td valign=top>ftp.pl.debian.org<br>  (ftp.task.gda.pl)</td>
 <td valign=top><a href="ftp://ftp.pl.debian.org/debian/">/debian/</a></td>
 <td valign=top><a href="http://ftp.pl.debian.org/debian/">/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>ftp.icm.edu.pl</td>
 <td valign=top><a href="ftp://ftp.icm.edu.pl/pub/Linux/debian/">/pub/Linux/debian/</a></td>
 <td valign=top><a href="http://ftp.icm.edu.pl/pub/Linux/debian/">/pub/Linux/debian/</a></td>
-<td valign=top><small><small>alpha amd64 hurd-i386 i386 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 hurd-i386 i386 powerpc sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>ftp.man.szczecin.pl</td>
 <td valign=top><a href="ftp://ftp.man.szczecin.pl/pub/Linux/debian/">/pub/Linux/debian/</a></td>
 <td></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>ftp.vectranet.pl</td>
@@ -1844,13 +1787,13 @@ Everything else you want to know about Debian mirrors:
 <td valign=top>ftp.pwr.wroc.pl</td>
 <td valign=top><a href="ftp://ftp.pwr.wroc.pl/debian/">/debian/</a></td>
 <td valign=top><a href="http://ftp.pwr.wroc.pl/debian/">/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>ftp.man.poznan.pl</td>
 <td valign=top><a href="ftp://ftp.man.poznan.pl/pub/linux/debian/debian/">/pub/linux/debian/debian/</a></td>
 <td valign=top><a href="http://ftp.man.poznan.pl/pub/linux/debian/debian/">/pub/linux/debian/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>piotrkosoft.net</td>
@@ -1866,55 +1809,43 @@ Everything else you want to know about Debian mirrors:
 <td valign=top>ftp.pt.debian.org<br>  (ftp.uevora.pt)</td>
 <td valign=top><a href="ftp://ftp.pt.debian.org/debian/">/debian/</a></td>
 <td valign=top><a href="http://ftp.pt.debian.org/debian/">/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>ftp.eq.uc.pt</td>
 <td valign=top><a href="ftp://ftp.eq.uc.pt/pub/software/Linux/debian/">/pub/software/Linux/debian/</a></td>
 <td valign=top><a href="http://ftp.eq.uc.pt/software/Linux/debian/">/software/Linux/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>debian.ua.pt</td>
 <td valign=top><a href="ftp://debian.ua.pt/debian/">/debian/</a></td>
 <td valign=top><a href="http://debian.ua.pt/debian/">/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
-</tr>
-<tr>
-<td valign=top>ftp.linux.pt</td>
-<td valign=top><a href="ftp://ftp.linux.pt/pub/mirrors/debian/">/pub/mirrors/debian/</a></td>
-<td valign=top><a href="http://ftp.linux.pt/pub/mirrors/debian/">/pub/mirrors/debian/</a></td>
-<td valign=top><small><small>amd64 hurd-i386 i386</small></small></td>
-</tr>
-<tr>
-<td valign=top>ftp.telepac.pt</td>
-<td valign=top><a href="ftp://ftp.telepac.pt/pub/debian/">/pub/debian/</a></td>
-<td></td>
-<td valign=top><small><small>amd64 i386 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>mirrors.nfsi.pt</td>
 <td valign=top><a href="ftp://mirrors.nfsi.pt/pub/debian/">/pub/debian/</a></td>
 <td valign=top><a href="http://mirrors.nfsi.pt/debian/">/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>neacm.fe.up.pt</td>
 <td valign=top><a href="ftp://neacm.fe.up.pt/pub/debian/">/pub/debian/</a></td>
 <td valign=top><a href="http://neacm.fe.up.pt/debian/">/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>cesium.di.uminho.pt</td>
 <td valign=top><a href="ftp://cesium.di.uminho.pt/pub/debian/">/pub/debian/</a></td>
 <td valign=top><a href="http://cesium.di.uminho.pt/pub/debian/">/pub/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>debian.netvisao.pt</td>
 <td valign=top><a href="ftp://debian.netvisao.pt/debian/">/debian/</a></td>
 <td valign=top><a href="http://debian.netvisao.pt/">/</a></td>
-<td valign=top><small><small>alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>debian.dcc.fc.up.pt</td>
@@ -1926,7 +1857,7 @@ Everything else you want to know about Debian mirrors:
 <td valign=top>mirror.sim.ul.pt</td>
 <td valign=top><a href="ftp://mirror.sim.ul.pt/debian/">/debian/</a></td>
 <td valign=top><a href="http://mirror.sim.ul.pt/debian/">/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 
 <tr><td colspan=4><hr size=1></td></tr>
@@ -1936,7 +1867,7 @@ Everything else you want to know about Debian mirrors:
 <td valign=top>ftp.ro.debian.org<br>  (ftp.iasi.roedu.net)</td>
 <td valign=top><a href="ftp://ftp.ro.debian.org/debian/">/debian/</a></td>
 <td valign=top><a href="http://ftp.ro.debian.org/debian/">/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>ftp.lug.ro</td>
@@ -1958,13 +1889,7 @@ Everything else you want to know about Debian mirrors:
 <td valign=top>ftp.ru.debian.org<br>  (ftp.chg.ru)</td>
 <td valign=top><a href="ftp://ftp.ru.debian.org/debian/">/debian/</a></td>
 <td valign=top><a href="http://ftp.ru.debian.org/debian/">/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
-</tr>
-<tr>
-<td valign=top>debian.nsu.ru</td>
-<td valign=top><a href="ftp://debian.nsu.ru/debian/">/debian/</a></td>
-<td valign=top><a href="http://debian.nsu.ru/debian/">/debian/</a></td>
-<td valign=top><small><small>amd64 i386</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>ftp.psn.ru</td>
@@ -1982,13 +1907,13 @@ Everything else you want to know about Debian mirrors:
 <td valign=top>ftp.mipt.ru</td>
 <td valign=top><a href="ftp://ftp.mipt.ru/debian/">/debian/</a></td>
 <td></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>mirror.yandex.ru</td>
 <td valign=top><a href="ftp://mirror.yandex.ru/debian/">/debian/</a></td>
 <td valign=top><a href="http://mirror.yandex.ru/debian/">/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>ftp.debian.chuvsu.ru</td>
@@ -2004,43 +1929,43 @@ Everything else you want to know about Debian mirrors:
 <td valign=top>ftp.se.debian.org<br>  (ftp.acc.umu.se)</td>
 <td valign=top><a href="ftp://ftp.se.debian.org/debian/">/debian/</a></td>
 <td valign=top><a href="http://ftp.se.debian.org/debian/">/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>ftp.sunet.se</td>
 <td valign=top><a href="ftp://ftp.sunet.se/pub/Linux/distributions/debian/">/pub/Linux/distributions/debian/</a></td>
 <td valign=top><a href="http://ftp.sunet.se/pub/Linux/distributions/debian/">/pub/Linux/distributions/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>ftp.port80.se</td>
 <td valign=top><a href="ftp://ftp.port80.se/debian/">/debian/</a></td>
 <td valign=top><a href="http://ftp.port80.se/debian/">/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>ftp.ds.karen.hj.se</td>
-<td valign=top><a href="ftp://ftp.ds.karen.hj.se/pub/os/linux/debian/">/pub/os/linux/debian/</a></td>
-<td valign=top><a href="http://ftp.ds.karen.hj.se/pub/os/linux/debian/">/pub/os/linux/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><a href="ftp://ftp.ds.karen.hj.se/debian/">/debian/</a></td>
+<td valign=top><a href="http://ftp.ds.karen.hj.se/debian/">/debian/</a></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
+</tr>
+<tr>
+<td valign=top>debian.bsnet.se</td>
+<td valign=top><a href="ftp://debian.bsnet.se/debian/">/debian/</a></td>
+<td valign=top><a href="http://debian.bsnet.se/debian/">/debian/</a></td>
+<td valign=top><small><small>amd64 i386</small></small></td>
 </tr>
 <tr>
 <td valign=top>debian.lth.se</td>
 <td valign=top><a href="ftp://debian.lth.se/debian/">/debian/</a></td>
 <td valign=top><a href="http://debian.lth.se/debian/">/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>ftp.df.lth.se</td>
 <td valign=top><a href="ftp://ftp.df.lth.se/debian/">/debian/</a></td>
 <td></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
-</tr>
-<tr>
-<td valign=top>kalle.csb.ki.se</td>
-<td></td>
-<td valign=top><a href="http://kalle.csb.ki.se/debian/">/debian/</a></td>
-<td valign=top><small><small>amd64 arm i386</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 
 <tr><td colspan=4><hr size=1></td></tr>
@@ -2060,7 +1985,7 @@ Everything else you want to know about Debian mirrors:
 <td valign=top>ftp.si.debian.org<br>  (ftp.camtp.uni-mb.si)</td>
 <td valign=top><a href="ftp://ftp.si.debian.org/debian/">/debian/</a></td>
 <td valign=top><a href="http://ftp.si.debian.org/debian/">/debian/</a></td>
-<td valign=top><small><small>alpha amd64 i386 ia64 m68k powerpc sparc</small></small></td>
+<td valign=top><small><small>amd64 i386 powerpc sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>ftp.arnes.si</td>
@@ -2072,7 +1997,7 @@ Everything else you want to know about Debian mirrors:
 <td valign=top>debian.prunk.si</td>
 <td valign=top><a href="ftp://debian.prunk.si/debian/">/debian/</a></td>
 <td valign=top><a href="http://debian.prunk.si/debian/">/debian/</a></td>
-<td valign=top><small><small>amd64 i386</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 
 <tr><td colspan=4><hr size=1></td></tr>
@@ -2082,25 +2007,25 @@ Everything else you want to know about Debian mirrors:
 <td valign=top>ftp.sk.debian.org<br>  (ftp.tuke.sk)</td>
 <td valign=top><a href="ftp://ftp.sk.debian.org/debian/">/debian/</a></td>
 <td valign=top><a href="http://ftp.sk.debian.org/debian/">/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
-<td valign=top>mirror.ynet.sk</td>
+<td valign=top>debian.ynet.sk</td>
+<td valign=top><a href="ftp://debian.ynet.sk/debian/">/debian/</a></td>
 <td></td>
-<td valign=top><a href="http://mirror.ynet.sk/debian/">/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>ftp.debian.sk</td>
 <td valign=top><a href="ftp://ftp.debian.sk/debian/">/debian/</a></td>
 <td valign=top><a href="http://ftp.debian.sk/debian/">/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>ftp.antik.sk</td>
 <td valign=top><a href="ftp://ftp.antik.sk/debian/">/debian/</a></td>
 <td valign=top><a href="http://ftp.antik.sk/debian/">/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 
 <tr><td colspan=4><hr size=1></td></tr>
@@ -2108,7 +2033,7 @@ Everything else you want to know about Debian mirrors:
 
 <tr>
 <td valign=top>debian.ues.edu.sv</td>
-<td valign=top><a href="ftp://debian.ues.edu.sv/debian/">/debian/</a></td>
+<td></td>
 <td valign=top><a href="http://debian.ues.edu.sv/debian/">/debian/</a></td>
 <td valign=top><small><small>amd64 i386 ia64</small></small></td>
 </tr>
@@ -2123,10 +2048,10 @@ Everything else you want to know about Debian mirrors:
 <td valign=top><small><small>i386</small></small></td>
 </tr>
 <tr>
-<td valign=top>ftp.thaios.net</td>
+<td valign=top>debian.thaios.net</td>
 <td></td>
-<td valign=top><a href="http://ftp.thaios.net/debian/">/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><a href="http://debian.thaios.net/debian/">/debian/</a></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>ftp.debianclub.org</td>
@@ -2142,7 +2067,7 @@ Everything else you want to know about Debian mirrors:
 <td valign=top>ftp.tr.debian.org<br>  (debian.ankara.edu.tr)</td>
 <td valign=top><a href="ftp://ftp.tr.debian.org/debian/">/debian/</a></td>
 <td valign=top><a href="http://ftp.tr.debian.org/debian/">/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>ftp.linux.org.tr</td>
@@ -2172,7 +2097,7 @@ Everything else you want to know about Debian mirrors:
 <td valign=top>ftp.metu.edu.tr</td>
 <td valign=top><a href="ftp://ftp.metu.edu.tr/debian/">/debian/</a></td>
 <td valign=top><a href="http://ftp.metu.edu.tr/debian/">/debian/</a></td>
-<td valign=top><small><small>ALL alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 
 <tr><td colspan=4><hr size=1></td></tr>
@@ -2182,7 +2107,7 @@ Everything else you want to know about Debian mirrors:
 <td valign=top>ftp.tw.debian.org<br>  (debian.linux.org.tw)</td>
 <td valign=top><a href="ftp://ftp.tw.debian.org/debian/">/debian/</a></td>
 <td valign=top><a href="http://ftp.tw.debian.org/debian/">/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>debian.csie.ntu.edu.tw</td>
@@ -2194,67 +2119,61 @@ Everything else you want to know about Debian mirrors:
 <td valign=top>ftp.twaren.net</td>
 <td valign=top><a href="ftp://ftp.twaren.net/debian/">/debian/</a></td>
 <td valign=top><a href="http://ftp.twaren.net/debian/">/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>opensource.nchc.org.tw</td>
 <td valign=top><a href="ftp://opensource.nchc.org.tw/debian/">/debian/</a></td>
 <td valign=top><a href="http://opensource.nchc.org.tw/debian/">/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>ftp.isu.edu.tw</td>
 <td valign=top><a href="ftp://ftp.isu.edu.tw/debian/">/debian/</a></td>
 <td valign=top><a href="http://ftp.isu.edu.tw/debian/">/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>debian.nctu.edu.tw</td>
 <td valign=top><a href="ftp://debian.nctu.edu.tw/debian/">/debian/</a></td>
 <td valign=top><a href="http://debian.nctu.edu.tw/debian/">/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>mirror.nttu.edu.tw</td>
 <td valign=top><a href="ftp://mirror.nttu.edu.tw/debian/">/debian/</a></td>
 <td valign=top><a href="http://mirror.nttu.edu.tw/debian/">/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>debian.csie.nctu.edu.tw</td>
 <td valign=top><a href="ftp://debian.csie.nctu.edu.tw/debian/">/debian/</a></td>
 <td valign=top><a href="http://debian.csie.nctu.edu.tw/debian/">/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
-</tr>
-<tr>
-<td valign=top>ftp.ncnu.edu.tw</td>
-<td valign=top><a href="ftp://ftp.ncnu.edu.tw/Linux/Debian/debian/">/Linux/Debian/debian/</a></td>
-<td valign=top><a href="http://ftp.ncnu.edu.tw/Linux/Debian/debian/">/Linux/Debian/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>ftp.cse.yzu.edu.tw</td>
 <td valign=top><a href="ftp://ftp.cse.yzu.edu.tw/pub/Linux/debian/debian/">/pub/Linux/debian/debian/</a></td>
 <td valign=top><a href="http://ftp.cse.yzu.edu.tw/pub/Linux/debian/debian/">/pub/Linux/debian/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 
 <tr><td colspan=4><hr size=1></td></tr>
 <tr><td colspan=4><big><strong>UA Ukraine</strong></big></td></tr>
 
 <tr>
+<td valign=top>ftp.ua.debian.org<br>  (debian.org.ua)</td>
+<td valign=top><a href="ftp://ftp.ua.debian.org/debian/">/debian/</a></td>
+<td valign=top><a href="http://ftp.ua.debian.org/debian/">/debian/</a></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
+</tr>
+<tr>
 <td valign=top>debian.osdn.org.ua</td>
 <td valign=top><a href="ftp://debian.osdn.org.ua/pub/Debian/debian/">/pub/Debian/debian/</a></td>
 <td valign=top><a href="http://debian.osdn.org.ua/debian/">/debian/</a></td>
 <td valign=top><small><small>i386</small></small></td>
 </tr>
 <tr>
-<td valign=top>debian.org.ua</td>
-<td valign=top><a href="ftp://debian.org.ua/debian/">/debian/</a></td>
-<td valign=top><a href="http://debian.org.ua/debian/">/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
-</tr>
-<tr>
 <td valign=top>ftp.3logic.net</td>
 <td valign=top><a href="ftp://ftp.3logic.net/debian/">/debian/</a></td>
 <td></td>
@@ -2280,19 +2199,19 @@ Everything else you want to know about Debian mirrors:
 <td valign=top>ftp.us.debian.org<br>  (ftp.egr.msu.edu, mirrors.kernel.org, debian.osuosl.org, debian.lcs.mit.edu)</td>
 <td valign=top><a href="ftp://ftp.us.debian.org/debian/">/debian/</a></td>
 <td valign=top><a href="http://ftp.us.debian.org/debian/">/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>ftp.gtlib.gatech.edu</td>
 <td valign=top><a href="ftp://ftp.gtlib.gatech.edu/pub/debian/">/pub/debian/</a></td>
 <td valign=top><a href="http://ftp.gtlib.gatech.edu/debian/">/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>ftp.egr.msu.edu</td>
 <td valign=top><a href="ftp://ftp.egr.msu.edu/debian/">/debian/</a></td>
 <td valign=top><a href="http://ftp.egr.msu.edu/debian/">/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>distro.ibiblio.org</td>
@@ -2304,13 +2223,7 @@ Everything else you want to know about Debian mirrors:
 <td valign=top>ftp-mirror.internap.com</td>
 <td valign=top><a href="ftp://ftp-mirror.internap.com/pub/debian/">/pub/debian/</a></td>
 <td valign=top><a href="http://ftp-mirror.internap.com/pub/debian/">/pub/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
-</tr>
-<tr>
-<td valign=top>ftp.cerias.purdue.edu</td>
-<td valign=top><a href="ftp://ftp.cerias.purdue.edu/pub/os/debian/">/pub/os/debian/</a></td>
-<td valign=top><a href="http://ftp.cerias.purdue.edu/pub/os/debian/">/pub/os/debian/</a></td>
-<td valign=top><small><small>amd64 hurd-i386 i386 ia64 powerpc sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>mirror.cs.wisc.edu</td>
@@ -2322,31 +2235,31 @@ Everything else you want to know about Debian mirrors:
 <td valign=top>ftp.uwsg.indiana.edu</td>
 <td valign=top><a href="ftp://ftp.uwsg.indiana.edu/linux/debian/">/linux/debian/</a></td>
 <td valign=top><a href="http://ftp.uwsg.indiana.edu/linux/debian/">/linux/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>natasha.stmarytx.edu</td>
 <td valign=top><a href="ftp://natasha.stmarytx.edu/debian/">/debian/</a></td>
 <td valign=top><a href="http://natasha.stmarytx.edu/debian/">/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>ftp.ndlug.nd.edu</td>
 <td valign=top><a href="ftp://ftp.ndlug.nd.edu/debian/">/debian/</a></td>
 <td valign=top><a href="http://ftp.ndlug.nd.edu/mirrors/debian/">/mirrors/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>debian.uchicago.edu</td>
 <td valign=top><a href="ftp://debian.uchicago.edu/debian/">/debian/</a></td>
 <td valign=top><a href="http://debian.uchicago.edu/debian/">/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>carroll.aset.psu.edu</td>
 <td valign=top><a href="ftp://carroll.aset.psu.edu/pub/linux/distributions/debian/">/pub/linux/distributions/debian/</a></td>
 <td valign=top><a href="http://carroll.aset.psu.edu/pub/linux/distributions/debian/">/pub/linux/distributions/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>gladiator.real-time.com</td>
@@ -2358,7 +2271,7 @@ Everything else you want to know about Debian mirrors:
 <td valign=top>mirrors.kernel.org</td>
 <td valign=top><a href="ftp://mirrors.kernel.org/debian/">/debian/</a></td>
 <td valign=top><a href="http://mirrors.kernel.org/debian/">/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>mirrors.xmission.com</td>
@@ -2376,13 +2289,13 @@ Everything else you want to know about Debian mirrors:
 <td valign=top>debian.lcs.mit.edu</td>
 <td valign=top><a href="ftp://debian.lcs.mit.edu/debian/">/debian/</a></td>
 <td valign=top><a href="http://debian.lcs.mit.edu/debian/">/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>linux.csua.berkeley.edu</td>
 <td></td>
 <td valign=top><a href="http://linux.csua.berkeley.edu/debian/">/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>ftp.silug.org</td>
@@ -2394,19 +2307,19 @@ Everything else you want to know about Debian mirrors:
 <td valign=top>debian.secsup.org</td>
 <td valign=top><a href="ftp://debian.secsup.org/pub/linux/debian/">/pub/linux/debian/</a></td>
 <td valign=top><a href="http://debian.secsup.org/">/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>debian.osuosl.org</td>
 <td valign=top><a href="ftp://debian.osuosl.org/debian/">/debian/</a></td>
 <td valign=top><a href="http://debian.osuosl.org/debian/">/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>mirror.anl.gov</td>
 <td valign=top><a href="ftp://mirror.anl.gov/pub/debian/">/pub/debian/</a></td>
 <td valign=top><a href="http://mirror.anl.gov/debian/">/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>sluglug.ucsc.edu</td>
@@ -2424,13 +2337,13 @@ Everything else you want to know about Debian mirrors:
 <td valign=top>mirrors.usc.edu</td>
 <td valign=top><a href="ftp://mirrors.usc.edu/pub/linux/distributions/debian/">/pub/linux/distributions/debian/</a></td>
 <td valign=top><a href="http://mirrors.usc.edu/pub/linux/distributions/debian/">/pub/linux/distributions/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>debian.mirrors.pair.com</td>
 <td valign=top><a href="ftp://debian.mirrors.pair.com/">/</a></td>
 <td valign=top><a href="http://debian.mirrors.pair.com/">/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>lug.mtu.edu</td>
@@ -2442,7 +2355,7 @@ Everything else you want to know about Debian mirrors:
 <td valign=top>debian.mirrors.tds.net</td>
 <td valign=top><a href="ftp://debian.mirrors.tds.net/debian/">/debian/</a></td>
 <td valign=top><a href="http://debian.mirrors.tds.net/debian/">/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>debian.cites.uiuc.edu</td>
@@ -2454,25 +2367,19 @@ Everything else you want to know about Debian mirrors:
 <td valign=top>mirrors.tummy.com</td>
 <td valign=top><a href="ftp://mirrors.tummy.com/debian/">/debian/</a></td>
 <td valign=top><a href="http://mirrors.tummy.com/debian/">/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>debian.mirror.frontiernet.net</td>
 <td valign=top><a href="ftp://debian.mirror.frontiernet.net/debian/">/debian/</a></td>
 <td valign=top><a href="http://debian.mirror.frontiernet.net/debian/">/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>cudlug.cudenver.edu</td>
-<td valign=top><a href="ftp://cudlug.cudenver.edu/debian/">/debian/</a></td>
-<td valign=top><a href="http://cudlug.cudenver.edu/debian/">/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
-</tr>
-<tr>
-<td valign=top>bigmirror.crossbowproject.net</td>
-<td valign=top><a href="ftp://bigmirror.crossbowproject.net/pub/debian/">/pub/debian/</a></td>
 <td></td>
-<td valign=top><small><small>alpha arm armel hppa i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><a href="http://cudlug.cudenver.edu/debian/">/debian/</a></td>
+<td valign=top><small><small>alpha amd64 arm hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>mirror.cc.columbia.edu</td>
@@ -2502,13 +2409,13 @@ Everything else you want to know about Debian mirrors:
 <td valign=top>debian.ams.sunysb.edu</td>
 <td></td>
 <td valign=top><a href="http://debian.ams.sunysb.edu/debian/">/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>mirrors.acm.jhu.edu</td>
 <td></td>
 <td valign=top><a href="http://mirrors.acm.jhu.edu/debian/">/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>ftp.uga.edu</td>
@@ -2526,7 +2433,7 @@ Everything else you want to know about Debian mirrors:
 <td valign=top>ftp.utexas.edu</td>
 <td valign=top><a href="ftp://ftp.utexas.edu/pub/debian/">/pub/debian/</a></td>
 <td valign=top><a href="http://ftp.utexas.edu/debian/">/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>mirror.fdcservers.net</td>
@@ -2550,29 +2457,29 @@ Everything else you want to know about Debian mirrors:
 <td valign=top>mirror.its.uidaho.edu</td>
 <td valign=top><a href="ftp://mirror.its.uidaho.edu/debian/">/debian/</a></td>
 <td valign=top><a href="http://mirror.its.uidaho.edu/pub/debian/">/pub/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>debian.cs.binghamton.edu</td>
 <td valign=top><a href="ftp://debian.cs.binghamton.edu/debian/">/debian/</a></td>
 <td valign=top><a href="http://debian.cs.binghamton.edu/debian/">/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
+</tr>
+<tr>
+<td valign=top>mirror.hmc.edu</td>
+<td></td>
+<td valign=top><a href="http://mirror.hmc.edu/debian/">/debian/</a></td>
+<td valign=top><small><small>amd64 hppa i386 powerpc</small></small></td>
 </tr>
 
 <tr><td colspan=4><hr size=1></td></tr>
 <tr><td colspan=4><big><strong>UZ Uzbekistan</strong></big></td></tr>
 
 <tr>
-<td valign=top>debian.snet.uz</td>
-<td></td>
-<td valign=top><a href="http://debian.snet.uz/debian/">/debian/</a></td>
-<td valign=top><small><small>amd64 i386</small></small></td>
-</tr>
-<tr>
 <td valign=top>debian.stream.uz</td>
 <td valign=top><a href="ftp://debian.stream.uz/debian/">/debian/</a></td>
 <td valign=top><a href="http://debian.stream.uz/debian/">/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 
 <tr><td colspan=4><hr size=1></td></tr>
@@ -2582,13 +2489,7 @@ Everything else you want to know about Debian mirrors:
 <td valign=top>debian.unesr.edu.ve</td>
 <td></td>
 <td valign=top><a href="http://debian.unesr.edu.ve/debian/">/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
-</tr>
-<tr>
-<td valign=top>ftp.ula.ve</td>
-<td valign=top><a href="ftp://ftp.ula.ve/debian/">/debian/</a></td>
-<td valign=top><a href="http://ftp.ula.ve/debian/">/debian/</a></td>
-<td valign=top><small><small>alpha amd64 i386 ia64 powerpc sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 
 <tr><td colspan=4><hr size=1></td></tr>
@@ -2604,19 +2505,19 @@ Everything else you want to know about Debian mirrors:
 <td valign=top>debian.mirror.ac.za</td>
 <td valign=top><a href="ftp://debian.mirror.ac.za/debian/">/debian/</a></td>
 <td valign=top><a href="http://debian.mirror.ac.za/debian/">/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>ftp.is.co.za</td>
 <td valign=top><a href="ftp://ftp.is.co.za/debian/">/debian/</a></td>
 <td></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 </table>
 <hr>
 <table border="0" width="100%"><tr>
-  <td align="left"><small>Last modified: Sun Nov  2 19:52:19 2008</small></td>
-  <td align="right"><small>Number of sites listed: 417</small></td>
+  <td align="left"><small>Last modified: Sun Feb  8 01:52:17 2009</small></td>
+  <td align="right"><small>Number of sites listed: 415</small></td>
 </tr></table>
 </body>
 </html>
diff --git a/includes/lenny/install/README.mirrors.txt b/includes/lenny/install/README.mirrors.txt
index eba36b7..167ac9e 100644
--- a/includes/lenny/install/README.mirrors.txt
+++ b/includes/lenny/install/README.mirrors.txt
@@ -37,48 +37,49 @@ Everything else you want to know about Debian mirrors:
 
  Country         Site                  Debian archive  Architectures
  ---------------------------------------------------------------------------
- Austria         ftp.at.debian.org     /debian/        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
- Australia       ftp.au.debian.org     /debian/        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
- Belgium         ftp.be.debian.org     /debian/        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
- Bulgaria        ftp.bg.debian.org     /debian/        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
- Brazil          ftp.br.debian.org     /debian/        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
- Canada          ftp.ca.debian.org     /debian/        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
- Switzerland     ftp.ch.debian.org     /debian/        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
- Chile           ftp.cl.debian.org     /debian/        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
- Czech Republic  ftp.cz.debian.org     /debian/        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
- Germany         ftp.de.debian.org     /debian/        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
- Germany         ftp2.de.debian.org    /debian/        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
- Denmark         ftp.dk.debian.org     /debian/        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
- Estonia         ftp.ee.debian.org     /debian/        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
- Spain           ftp.es.debian.org     /debian/        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
- Finland         ftp.fi.debian.org     /debian/        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
- France          ftp.fr.debian.org     /debian/        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
- France          ftp2.fr.debian.org    /debian/        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
- Great Britain   ftp.uk.debian.org     /debian/        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
- Greece          ftp.gr.debian.org     /debian/        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
+ Austria         ftp.at.debian.org     /debian/        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+ Australia       ftp.au.debian.org     /debian/        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+ Belgium         ftp.be.debian.org     /debian/        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+ Bulgaria        ftp.bg.debian.org     /debian/        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+ Brazil          ftp.br.debian.org     /debian/        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+ Canada          ftp.ca.debian.org     /debian/        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+ Switzerland     ftp.ch.debian.org     /debian/        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+ Chile           ftp.cl.debian.org     /debian/        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+ Czech Republic  ftp.cz.debian.org     /debian/        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+ Germany         ftp.de.debian.org     /debian/        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+ Germany         ftp2.de.debian.org    /debian/        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+ Denmark         ftp.dk.debian.org     /debian/        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+ Estonia         ftp.ee.debian.org     /debian/        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+ Spain           ftp.es.debian.org     /debian/        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+ Finland         ftp.fi.debian.org     /debian/        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+ France          ftp.fr.debian.org     /debian/        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+ France          ftp2.fr.debian.org    /debian/        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+ Great Britain   ftp.uk.debian.org     /debian/        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+ Greece          ftp.gr.debian.org     /debian/        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
  Hong Kong       ftp.hk.debian.org     /debian/        alpha amd64 arm armel i386 ia64 powerpc sparc
- Croatia         ftp.hr.debian.org     /debian/        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
- Hungary         ftp.hu.debian.org     /debian/        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
- Ireland         ftp.ie.debian.org     /debian/        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
- Iceland         ftp.is.debian.org     /debian/        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
- Italy           ftp.it.debian.org     /debian/        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
- Japan           ftp.jp.debian.org     /debian/        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
- Japan           ftp2.jp.debian.org    /debian/        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
- Korea           ftp.kr.debian.org     /debian/        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
- Mexico          ftp.mx.debian.org     /debian/        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
- Netherlands     ftp.nl.debian.org     /debian/        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
+ Croatia         ftp.hr.debian.org     /debian/        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+ Hungary         ftp.hu.debian.org     /debian/        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+ Ireland         ftp.ie.debian.org     /debian/        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+ Iceland         ftp.is.debian.org     /debian/        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+ Italy           ftp.it.debian.org     /debian/        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+ Japan           ftp.jp.debian.org     /debian/        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+ Japan           ftp2.jp.debian.org    /debian/        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+ Korea           ftp.kr.debian.org     /debian/        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+ Mexico          ftp.mx.debian.org     /debian/        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+ Netherlands     ftp.nl.debian.org     /debian/        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
  Norway          ftp.no.debian.org     /debian/        amd64 i386 ia64 powerpc sparc
- New Zealand     ftp.nz.debian.org     /debian/        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
- Poland          ftp.pl.debian.org     /debian/        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
- Portugal        ftp.pt.debian.org     /debian/        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
- Romania         ftp.ro.debian.org     /debian/        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
- Russia          ftp.ru.debian.org     /debian/        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
- Sweden          ftp.se.debian.org     /debian/        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
- Slovenia        ftp.si.debian.org     /debian/        alpha amd64 i386 ia64 m68k powerpc sparc
- Slovakia        ftp.sk.debian.org     /debian/        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
- Turkey          ftp.tr.debian.org     /debian/        alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
- Taiwan          ftp.tw.debian.org     /debian/        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
- United States   ftp.us.debian.org     /debian/        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
+ New Zealand     ftp.nz.debian.org     /debian/        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+ Poland          ftp.pl.debian.org     /debian/        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+ Portugal        ftp.pt.debian.org     /debian/        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+ Romania         ftp.ro.debian.org     /debian/        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+ Russia          ftp.ru.debian.org     /debian/        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+ Sweden          ftp.se.debian.org     /debian/        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+ Slovenia        ftp.si.debian.org     /debian/        amd64 i386 powerpc sparc
+ Slovakia        ftp.sk.debian.org     /debian/        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+ Turkey          ftp.tr.debian.org     /debian/        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+ Taiwan          ftp.tw.debian.org     /debian/        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+ Ukraine         ftp.ua.debian.org     /debian/        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+ United States   ftp.us.debian.org     /debian/        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
 
 
                    Secondary mirrors of the Debian archive
@@ -91,61 +92,64 @@ AR Argentina
 ------------
 debian.logiclinux.com                                           /debian/                        amd64 i386
 ftp.ccc.uba.ar                  /pub/linux/debian/debian/       /pub/linux/debian/debian/       amd64 i386
-debian.torredehanoi.org         /debian/                        /debian/                        alpha amd64 arm armel hppa i386 ia64 m68k mips mipsel powerpc s390 sparc
+debian.torredehanoi.org         /debian/                        /debian/                        alpha amd64 arm armel hppa i386 ia64 mips mipsel powerpc s390 sparc
 
 AT Austria
 ----------
-ftp.at.debian.org               /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
+ftp.at.debian.org               /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
   (debian.sil.at)
-gd.tuwien.ac.at                 /opsys/linux/debian/            /opsys/linux/debian/            alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
+gd.tuwien.ac.at                 /opsys/linux/debian/            /opsys/linux/debian/            alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
 debian.mur.at                   /debian/                        /debian/                        amd64 i386 ia64
-ftp.tu-graz.ac.at               /mirror/debian/                 /mirror/debian/                 alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
+ftp.tu-graz.ac.at               /mirror/debian/                 /mirror/debian/                 alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
 ftp.univie.ac.at                /systems/linux/debian/debian/   /systems/linux/debian/debian/   i386
 debian.inode.at                 /debian/                        /debian/                        alpha amd64 arm armel i386 powerpc sparc
-esda.wu-wien.ac.at              /pub/debian/                                                    amd64 i386 powerpc
-debian.lagis.at                 /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
+debian.lagis.at                 /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
 
 AU Australia
 ------------
-ftp.au.debian.org               /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
+ftp.au.debian.org               /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
   (mirror.linux.org.au)
-mirror.aarnet.edu.au            /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
+mirror.aarnet.edu.au            /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
 ftp.monash.edu.au               /pub/linux/debian/              /pub/linux/debian/              amd64 i386
 ftp.uwa.edu.au                  /debian/                        /debian/                        amd64 i386
 mirror.eftel.com                /debian/                        /debian/                        amd64 i386
-mirror.pacific.net.au           /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
-ftp.iinet.net.au                /debian/debian/                 /debian/debian/                 alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
-mirror.optus.net                /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
+mirror.pacific.net.au           /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+ftp.iinet.net.au                /debian/debian/                 /debian/debian/                 alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+mirror.optus.net                /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
 mirror.cse.unsw.edu.au          /debian/                        /debian/                        amd64 i386 ia64 powerpc
 mirror.3fl.net.au               /pub/debian/                    /debian/                        amd64 i386
-ftp.netspace.net.au             /pub/debian/                    /pub/debian/                    alpha amd64 arm armel hppa i386 ia64 m68k mips mipsel powerpc s390 sparc
+ftp.netspace.net.au             /pub/debian/                    /pub/debian/                    alpha amd64 arm armel hppa i386 ia64 mips mipsel powerpc s390 sparc
+
+BA Bosnia & Herzegovina
+-----------------------
+mirror.debian.com.ba            /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
 
 BE Belgium
 ----------
-ftp.be.debian.org               /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
+ftp.be.debian.org               /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
   (ftp.belnet.be)
-ftp.kulnet.kuleuven.ac.be       /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
-ftp.easynet.be                  /debian/                        /ftp/debian/                    alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
-ftp.debian.skynet.be            /debian/                        /ftp/debian/                    alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
-mirror.be.gbxs.net              /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
+ftp.kulnet.kuleuven.ac.be       /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+ftp.easynet.be                  /debian/                        /ftp/debian/                    alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+ftp.debian.skynet.be            /debian/                        /ftp/debian/                    alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+mirror.be.gbxs.net              /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
 
 BG Bulgaria
 -----------
-ftp.bg.debian.org               /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
+ftp.bg.debian.org               /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
   (debian.spnet.net)
 debian.ludost.net               /debian/                        /debian/                        i386
-ftp.uni-sofia.bg                /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
-debian.telecoms.bg              /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
+ftp.uni-sofia.bg                /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+debian.telecoms.bg              /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
 debian.mnet.bg                  /debian/                        /debian/                        i386
-debian.networx-bg.com           /debian/                        /debian/                        amd64 i386
+debian.networx-bg.com           /debian/                        /debian/                        amd64 armel i386
 
 BR Brazil
 ---------
-ftp.br.debian.org               /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
+ftp.br.debian.org               /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
   (debian.c3sl.ufpr.br)
 debian.das.ufsc.br              /pub/debian/                                                    amd64 i386
-download.unesp.br                                               /linux/debian/                  alpha amd64 arm armel hppa i386 ia64 m68k mips mipsel powerpc s390 sparc
-sft.if.usp.br                                                   /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
+download.unesp.br                                               /linux/debian/                  alpha amd64 arm armel hppa i386 ia64 mips mipsel powerpc s390 sparc
+sft.if.usp.br                                                   /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
 linorg.usp.br                   /debian/                        /debian/                        i386
 linux.iq.usp.br                                                 /debian/                        amd64 i386
 ftp.pucpr.br                    /debian/                                                        amd64 hurd-i386 i386
@@ -154,171 +158,164 @@ debian.pop-sc.rnp.br                                            /debian/
 
 BY Belarus
 ----------
-linux.org.by                    /debian/                        /debian/                        amd64 i386
+linux.org.by                                                    /debian/                        amd64 i386
 ftp.mgts.by                     /debian/                        /debian/                        amd64 i386
 
 CA Canada
 ---------
-ftp.ca.debian.org               /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
+ftp.ca.debian.org               /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
 debian.yorku.ca                                                 /debian/                        amd64 i386
-ftp3.nrc.ca                     /debian/                        /debian/                        alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
-gulus.usherbrooke.ca            /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
-mirror.cpsc.ucalgary.ca         /mirror/debian.org/debian/      /mirror/debian.org/debian/      amd64 i386
-mirror.peer1.net                                                /debian/                        alpha amd64 arm armel i386 mips mipsel powerpc sparc
-debian.mirror.rafal.ca          /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
+ftp3.nrc.ca                     /debian/                        /debian/                        alpha amd64 arm hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+gulus.usherbrooke.ca            /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+mirror.cpsc.ucalgary.ca         /debian/                        /mirror/debian.org/debian/      alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+mirror.peer1.net                                                /debian/                        amd64 i386
+debian.mirror.rafal.ca          /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
 debian.savoirfairelinux.net     /debian/                        /debian/                        amd64 i386 powerpc
-debian.mirror.iweb.ca           /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
+debian.mirror.iweb.ca           /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
 mirror.publicns.net             /pub/debian/                    /pub/debian/                    amd64 armel i386
-mirror.csclub.uwaterloo.ca      /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
+mirror.csclub.uwaterloo.ca      /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
 
 CH Switzerland
 --------------
-ftp.ch.debian.org               /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
+ftp.ch.debian.org               /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
   (debian.ethz.ch)
-mirror.switch.ch                /mirror/debian/                 /ftp/mirror/debian/             alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
+mirror.switch.ch                /mirror/debian/                 /ftp/mirror/debian/             alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
 debian.csg.uzh.ch                                               /debian/                        amd64 i386
 
 CL Chile
 --------
-ftp.cl.debian.org               /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
+ftp.cl.debian.org               /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
   (debian.ciencias.uchile.cl)
 debian.ubiobio.cl                                               /debian/                        amd64 i386 powerpc
 debian.utalca.cl                                                /debian/                        amd64 i386
 mirror.debian.cl                                                /debian/                        amd64 i386
-mirror.debianchile.cl                                           /debian/                        amd64 i386
+debian.netlinux.cl              /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390
 
 CN China
 --------
-mirrors.geekbone.org            /debian/                        /debian/                        alpha amd64 hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
-debian.cn99.com                 /debian/                        /debian/                        amd64 i386
-www.anheng.com.cn               /debian/                        /debian/                        alpha amd64 arm hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+mirrors.geekbone.org            /debian/                        /debian/                        alpha amd64 hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+www.anheng.com.cn               /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
 
 CZ Czech Republic
 -----------------
-ftp.cz.debian.org               /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
+ftp.cz.debian.org               /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
   (ftp.debian.cz)
-debian.sh.cvut.cz               /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
+debian.sh.cvut.cz               /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
 ftp.zcu.cz                      /mirrors/debian/                /mirrors/debian/                amd64 i386
 debian.mirror.web4u.cz          /                               /                               amd64 i386
 ftp.cvut.cz                     /debian/                        /debian/                        amd64 i386 ia64
-debian.ignum.cz                 /debian/                        /debian/                        alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
+debian.ignum.cz                 /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
 
 DE Germany
 ----------
-ftp.de.debian.org               /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
+ftp.de.debian.org               /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
   (debian.inf.tu-dresden.de)
-ftp2.de.debian.org              /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
+ftp2.de.debian.org              /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
   (ftp.rfc822.org)
-ftp.tu-clausthal.de             /pub/linux/debian/                                              amd64 arm armel i386 ia64 m68k mips powerpc sparc
-debian.uni-duisburg-essen.de    /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
-ftp.freenet.de                  /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
+ftp.tu-clausthal.de             /pub/linux/debian/                                              amd64 arm armel i386 ia64 mips powerpc sparc
+debian.uni-duisburg-essen.de    /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+ftp.freenet.de                  /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
 ftp.informatik.rwth-aachen.de   /pub/Linux/debian/              /ftp/pub/Linux/debian/          alpha amd64 i386 powerpc sparc
-ftp-stud.fht-esslingen.de       /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
+ftp-stud.fht-esslingen.de       /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
 ftp.stw-bonn.de                 /debian/                        /debian/                        amd64 i386
-ftp.fu-berlin.de                /pub/unix/linux/mirrors/debian/                                 alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
-debian.tu-bs.de                 /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
+ftp.fu-berlin.de                /pub/unix/linux/mirrors/debian/                                 alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+debian.tu-bs.de                 /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
 ftp.uni-koeln.de                /debian/                        /debian/                        alpha amd64 i386 powerpc sparc
-ftp.mpi-sb.mpg.de               /pub/linux/debian/                                              alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
-ftp.tiscali.de                  /pub/debian/debian/             /pub/debian/debian/             amd64 arm armel hurd-i386 i386 ia64
-ftp.tu-chemnitz.de              /pub/linux/debian/debian/       /pub/linux/debian/debian/       alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
+ftp.mpi-sb.mpg.de               /pub/linux/debian/                                              alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+ftp.tu-chemnitz.de              /pub/linux/debian/debian/       /pub/linux/debian/debian/       alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
 ftp.uni-kl.de                   /debian/                        /debian/                        amd64 i386 ia64 powerpc sparc
-ftp.uni-bayreuth.de             /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
-ftp.informatik.hu-berlin.de     /pub/Linux/debian/                                              alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
-ftp5.gwdg.de                    /pub/linux/debian/debian/       /pub/linux/debian/debian/       alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
-ftp.hosteurope.de               /pub/linux/debian/              /pub/linux/debian/              alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
+ftp.uni-bayreuth.de             /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+ftp.informatik.hu-berlin.de     /pub/Linux/debian/                                              alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+ftp5.gwdg.de                    /pub/linux/debian/debian/       /pub/linux/debian/debian/       alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+ftp.hosteurope.de               /pub/linux/debian/              /pub/linux/debian/              alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
 ftp.informatik.uni-frankfurt.de /pub/Mirrors/debian.org/debian/ /debian/                        amd64 i386 ia64 powerpc
-debian.netcologne.de            /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
+debian.netcologne.de            /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
 artfiles.org                    /debian/                        /debian/                        amd64 i386
-debian.intergenia.de                                            /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
+debian.intergenia.de                                            /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
 debian.cruisix.net              /debian/                        /debian/                        amd64 i386 powerpc
-ftp.rrzn.uni-hannover.de        /debian/debian/                                                 alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
+ftp.rrzn.uni-hannover.de        /debian/debian/                                                 amd64 i386 ia64
 debian.charite.de                                               /debian/                        i386
-ftp.plusline.de                 /pub/debian/                    /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
-sinclair.farm.ftbfs.de                                          /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
-ftp.halifax.rwth-aachen.de      /debian/                        /debian/                        amd64 i386
+ftp.plusline.de                 /pub/debian/                    /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+mirror.ayous.org                /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
 
 DK Denmark
 ----------
-ftp.dk.debian.org               /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
+ftp.dk.debian.org               /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
   (mirrors.dotsrc.org)
-ftp.dkuug.dk                    /pub/debian/                    /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
-mirror.here.dk                  /debian/                        /debian/                        amd64 i386 ia64 mips powerpc
+ftp.dkuug.dk                    /pub/debian/                    /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
 debian.uni-c.dk                                                 /debian/                        alpha amd64 i386 ia64 powerpc
 mirrors.telianet.dk             /debian/                        /debian/                        amd64 i386 powerpc sparc
-debianmirror.wwi.dk                                             /debian/                        alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
+debianmirror.wwi.dk                                             /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
 
 EE Estonia
 ----------
-ftp.ee.debian.org               /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
+ftp.ee.debian.org               /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
   (ftp.aso.ee)
 
 ES Spain
 --------
-ftp.es.debian.org               /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
-  (ulises.hostalia.com)
+ftp.es.debian.org               /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+  (ftp.gul.uc3m.es)
 ftp.rediris.es                  /debian/                        /debian/                        alpha amd64 i386 ia64 powerpc sparc
-ftp.cica.es                     /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
-ftp.caliu.cat                   /debian/                        /debian/                        amd64 i386 ia64 powerpc
-ftp.gva.es                      /mirror/debian/                 /mirror/debian/                 alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
-ftp.gul.uc3m.es                 /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
+ftp.cica.es                     /debian/                        /debian/                        amd64 i386 ia64 powerpc
+ftp.caliu.cat                   /debian/                        /debian/                        amd64 armel i386 ia64 powerpc
+ftp.gva.es                      /mirror/debian/                 /mirror/debian/                 alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
 ftp.um.es                       /mirror/debian/                                                 i386
-jane.uab.cat                    /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
-ftp.udc.es                      /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
+ftp.udc.es                      /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
 debian.grn.cat                  /debian/                        /debian/                        amd64 i386 ia64 powerpc
-debian.com.es                   /debian/                        /debian/                        alpha amd64 arm armel hppa i386 ia64 m68k mips mipsel powerpc s390 sparc
+debian.com.es                                                   /debian/                        alpha amd64 arm armel hppa i386 ia64 mips mipsel powerpc s390 sparc
 
 FI Finland
 ----------
-ftp.fi.debian.org               /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
+ftp.fi.debian.org               /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
   (trumpetti.atm.tut.fi)
-ftp.funet.fi                    /pub/linux/mirrors/debian/      /pub/linux/mirrors/debian/      alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
+ftp.funet.fi                    /pub/linux/mirrors/debian/      /pub/linux/mirrors/debian/      alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
 ftp.jyu.fi                      /debian/                        /debian/                        alpha amd64 hurd-i386 i386 powerpc sparc
 ftp.seclan.com                  /debian/                        /debian/                        amd64 i386 powerpc
 
 FR France
 ---------
-ftp.fr.debian.org               /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
+ftp.fr.debian.org               /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
   (debian.proxad.net)
-ftp2.fr.debian.org              /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
+ftp2.fr.debian.org              /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
   (ftp.oleane.net)
-ftp.iut-bm.univ-fcomte.fr       /debian/                        /debian/                        alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
-ftp.eudil.fr                    /debian/                        /debian/                        alpha arm armel hppa i386 ia64 m68k mips mipsel powerpc s390 sparc
-ftp.proxad.net                  /mirrors/ftp.debian.org/                                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
+ftp.iut-bm.univ-fcomte.fr       /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+ftp.eudil.fr                    /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+ftp.proxad.net                  /mirrors/ftp.debian.org/                                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
 ftp.lip6.fr                     /pub/linux/distributions/debian//pub/linux/distributions/debian/amd64 i386
-debian.ens-cachan.fr            /debian/                        /ftp/debian/                    alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
-ftp.u-picardie.fr               /mirror/debian/                 /mirror/debian/                 alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
-debian.mirrors.easynet.fr       /debian/                        /                               alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
-ftp.u-strasbg.fr                /debian/                        /debian/                        alpha amd64 hurd-i386 i386 ia64 m68k powerpc sparc
+debian.ens-cachan.fr            /debian/                        /ftp/debian/                    alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+ftp.u-picardie.fr               /mirror/debian/                 /mirror/debian/                 alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+debian.mirrors.easynet.fr       /debian/                        /                               alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+ftp.u-strasbg.fr                /debian/                        /debian/                        alpha amd64 armel hurd-i386 i386 ia64 powerpc sparc
 debian.cict.fr                  /debian/                        /debian/                        amd64 arm armel hurd-i386 i386
-mir1.ovh.net                    /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
-mir2.ovh.net                                                    /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
+mir1.ovh.net                    /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+mir2.ovh.net                                                    /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
 ftp.nerim.net                   /debian/                        /debian/                        i386
-ftp.crihan.fr                   /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
-debian.mines.inpl-nancy.fr      /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
-ftp.debian.ikoula.com           /debian/                                                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
-webb.ens-cachan.fr              /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
-mirrors.ircam.fr                /pub/debian/                    /pub/debian/                    alpha amd64 hurd-i386 i386 ia64 m68k mips mipsel powerpc sparc
+ftp.crihan.fr                   /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+debian.mines.inpl-nancy.fr      /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+webb.ens-cachan.fr              /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+mirrors.ircam.fr                /pub/debian/                    /pub/debian/                    alpha amd64 hurd-i386 i386 ia64 mips mipsel powerpc sparc
 debian.mirror.inra.fr           /debian/                        /debian/                        amd64 arm armel i386 ia64 powerpc sparc
-debian.med.univ-tours.fr        /debian/                        /debian/                        alpha amd64 arm armel hppa i386 ia64 m68k mips mipsel powerpc s390 sparc
+debian.med.univ-tours.fr        /debian/                        /debian/                        alpha amd64 arm armel hppa i386 ia64 mips mipsel powerpc s390 sparc
 ftp.univ-pau.fr                 /pub/mirrors/debian/            /linux/mirrors/debian/          amd64 i386
-ftp.univ-nantes.fr              /debian/                                                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
-mirrors.compuscene.org                                          /debian/                        amd64 i386
-debian.revolsys.fr              /debian/                        /debian/                        amd64 i386
+ftp.univ-nantes.fr              /debian/                                                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+mirrors.compuscene.org                                          /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
 debian.univ-reims.fr            /debian/                        /debian/                        amd64 i386
 
 GB Great Britain
 ----------------
-ftp.uk.debian.org               /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
+ftp.uk.debian.org               /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
   (debian.hands.com)
-debian.man.ac.uk                                                /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
-www.mirrorservice.org           /sites/ftp.debian.org/debian/   /sites/ftp.debian.org/debian/   alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
-ftp.ticklers.org                /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
-debian.virginmedia.com          /mirrors/ftp.debian.org         /                               alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
+debian.man.ac.uk                                                /debian/                        amd64 hurd-i386 i386
+www.mirrorservice.org           /sites/ftp.debian.org/debian/   /sites/ftp.debian.org/debian/   alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+ftp.ticklers.org                /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+debian.virginmedia.com          /mirrors/ftp.debian.org         /                               alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
 mirror.positive-internet.com    /debian/                        /debian/                        amd64 hppa i386 ia64 powerpc sparc
 the.earth.li                    /debian/                        /debian/                        amd64 hurd-i386 i386
-ukdebian.mirror.anlx.net        /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
-mirror.ox.ac.uk                 /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
+ukdebian.mirror.anlx.net        /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+mirror.ox.ac.uk                 /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
 debian.zetnet.co.uk             /debian/                        /debian/                        amd64 i386 mipsel
+mirror.sov.uk.goscomb.net       /debian/                        /debian/                        amd64 i386
 
 GE Georgia
 ----------
@@ -326,45 +323,44 @@ ftp.ifg.gtu.ge                  /debian/
 
 GR Greece
 ---------
-ftp.gr.debian.org               /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
+ftp.gr.debian.org               /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
   (ftp.ntua.gr)
-debian.otenet.gr                /pub/linux/debian/              /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
-ftp.duth.gr                     /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
-ftp.softnet.tuc.gr              /pub/linux/debian/              /ftp/linux/debian/              alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
-ftp.cc.uoc.gr                   /mirrors/linux/debian/          /mirrors/linux/debian/          alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
+debian.otenet.gr                /pub/linux/debian/              /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+ftp.duth.gr                     /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+ftp.softnet.tuc.gr                                              /ftp/linux/debian/              alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+ftp.cc.uoc.gr                   /mirrors/linux/debian/          /mirrors/linux/debian/          alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
 
 HK Hong Kong
 ------------
 ftp.hk.debian.org               /debian/                        /debian/                        alpha amd64 arm armel i386 ia64 powerpc sparc
-www.zentek-international.com                                    /mirrors/debian/                alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
 
 HR Croatia
 ----------
-ftp.hr.debian.org               /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
+ftp.hr.debian.org               /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
   (debian.carnet.hr)
-ftp.irb.hr                      /debian/                        /debian/                        alpha amd64 arm armel hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
-ftp.carnet.hr                   /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
+ftp.irb.hr                      /debian/                        /debian/                        alpha amd64 arm armel hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+ftp.carnet.hr                   /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
 debian.iskon.hr                 /debian/                        /debian/                        amd64 hurd-i386 i386 ia64 s390
 
 HU Hungary
 ----------
-ftp.hu.debian.org               /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
+ftp.hu.debian.org               /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
   (ftp.fsn.hu)
-ftp.kfki.hu                     /pub/linux/debian/              /linux/debian/                  alpha arm armel hppa i386 ia64 m68k mips mipsel powerpc s390 sparc
+ftp.kfki.hu                     /pub/linux/debian/              /linux/debian/                  alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
 ftp.bme.hu                      /OS/Linux/dist/debian/          /OS/Linux/dist/debian/          amd64 hurd-i386 i386 ia64
-debian.mirrors.crysys.hu        /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
+debian.mirrors.crysys.hu        /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
 debian.sth.sze.hu               /debian/                        /                               amd64 i386 ia64
 
 ID Indonesia
 ------------
 kebo.vlsm.org                   /debian/                        /debian/                        amd64 hurd-i386 i386 powerpc
-debian.indika.net.id                                            /debian/                        i386
+mirror.unej.ac.id               /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
 
 IE Ireland
 ----------
-ftp.ie.debian.org               /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
+ftp.ie.debian.org               /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
   (debian.heanet.ie)
-ftp.esat.net                    /pub/linux/debian/              /pub/linux/debian/              alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
+ftp.esat.net                    /pub/linux/debian/              /pub/linux/debian/              alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
 
 IL Israel
 ---------
@@ -377,52 +373,50 @@ ftp.iitm.ac.in                  /debian/                        /debian/
 
 IS Iceland
 ----------
-ftp.is.debian.org               /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
+ftp.is.debian.org               /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
   (ftp.rhnet.is)
 
 IT Italy
 --------
-ftp.it.debian.org               /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
+ftp.it.debian.org               /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
   (ftp.bofh.it)
 giano.com.dist.unige.it         /debian/                        /debian/                        amd64 arm armel i386
-ftp.bononia.it                  /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
+ftp.bononia.it                  /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
 freedom.dicea.unifi.it          /pub/linux/debian/              /ftp/pub/linux/debian/          amd64 hurd-i386 i386
-ftp.eutelia.it                  /pub/Debian_Mirror/                                             alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
-mi.mirror.garr.it               /mirrors/debian/                /mirrors/debian/                alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
-debian.fastweb.it               /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
-ftp.unina.it                    /pub/linux/distributions/debian//pub/linux/distributions/debian/alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
+mi.mirror.garr.it               /mirrors/debian/                /mirrors/debian/                alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+debian.fastweb.it               /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+ftp.unina.it                    /pub/linux/distributions/debian//pub/linux/distributions/debian/alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
 debian.fastbull.org             /debian/                        /debian/                        amd64 i386 powerpc
 debian.dynamica.it              /debian/                        /debian/                        amd64 hurd-i386 i386 ia64 powerpc
-mirror.units.it                                                 /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
+mirror.units.it                                                 /debian/                        amd64 i386
 
 JP Japan
 --------
-ftp2.jp.debian.org              /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
+ftp2.jp.debian.org              /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
   (ftp.debian.or.jp)
-ftp.jp.debian.org                                               /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
+ftp.jp.debian.org                                               /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
   (dennou-q.gfd-dennou.org, dennou-k.gfd-dennou.org, dennou-h.gfd-dennou.org, debian.topstudio.co.jp, www.oyu-net.jp, hanzubon.jp, ftp.nara.wide.ad.jp, ftp2.jp.debian.org)
-ftp.nara.wide.ad.jp             /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
-ring.asahi-net.or.jp            /pub/linux/debian/debian/       /archives/linux/debian/debian/  alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
-ftp.dti.ad.jp                   /pub/Linux/debian/              /pub/Linux/debian/              alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
-dennou-k.gfd-dennou.org         /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
-dennou-q.gfd-dennou.org         /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
+ftp.nara.wide.ad.jp             /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+ftp.dti.ad.jp                   /pub/Linux/debian/              /pub/Linux/debian/              alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+dennou-k.gfd-dennou.org         /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+dennou-q.gfd-dennou.org         /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+ftp.yz.yamagata-u.ac.jp         /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
 sb.itc.u-tokyo.ac.jp            /DEBIAN/                        /DEBIAN/                        amd64 hurd-i386 i386 powerpc
-ftp.riken.jp                    /Linux/debian/debian/           /Linux/debian/debian/           alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
+ftp.riken.jp                    /Linux/debian/debian/           /Linux/debian/debian/           alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
 debian.shimpinomori.net                                         /debian/                        amd64 i386 powerpc
-www.ring.gr.jp                  /pub/linux/debian/debian/       /archives/linux/debian/debian/  alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
-ftp.jaist.ac.jp                 /pub/Linux/Debian/              /pub/Linux/Debian/              alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
+ftp.jaist.ac.jp                 /pub/Linux/Debian/              /pub/Linux/Debian/              alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
 www.cohsoft.com                                                 /debian/                        amd64 hurd-i386 i386 powerpc
-dennou-h.gfd-dennou.org         /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
+dennou-h.gfd-dennou.org         /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
 
 KR Korea
 --------
-ftp.kr.debian.org               /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
+ftp.kr.debian.org               /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
   (ftp.kaist.ac.kr)
-ftp.daum.net                    /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
+ftp.daum.net                    /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
 
 LT Lithuania
 ------------
-ameba.sc-uni.ktu.lt             /debian/                        /debian/                        amd64 i386
+ftp.litnet.lt                   /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
 debian.balt.net                 /debian/                        /debian/                        amd64 arm armel i386 sparc
 
 LV Latvia
@@ -435,9 +429,9 @@ debian.eng.um.edu.mt                                            /debian/
 
 MX Mexico
 ---------
-ftp.mx.debian.org               /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
+ftp.mx.debian.org               /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
   (debian.unam.mx)
-mmc.igeofcu.unam.mx                                             /debian/                        amd64 hurd-i386 i386 ia64
+mmc.geofisica.unam.mx           /debian/                        /debian/                        amd64 hurd-i386 i386 ia64
 
 NC New Caledonia
 ----------------
@@ -449,12 +443,12 @@ debian.uni.edu.ni                                               /debian/
 
 NL Netherlands
 --------------
-ftp.nl.debian.org               /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
+ftp.nl.debian.org               /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
   (ftp.snt.utwente.nl)
-ftp.nluug.nl                    /pub/os/Linux/distr/debian/     /pub/os/Linux/distr/debian/     alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
-ftp.surfnet.nl                  /pub/os/Linux/distr/debian/     /os/Linux/distr/debian/         alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
-ftp.debian.nl                   /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
-ftp.tiscali.nl                  /pub/mirrors/debian/            /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
+ftp.nluug.nl                    /pub/os/Linux/distr/debian/     /pub/os/Linux/distr/debian/     alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+ftp.surfnet.nl                  /pub/os/Linux/distr/debian/     /os/Linux/distr/debian/         alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+ftp.debian.nl                   /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+ftp.tiscali.nl                  /pub/mirrors/debian/            /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
 
 NO Norway
 ---------
@@ -463,9 +457,8 @@ ftp.no.debian.org               /debian/                        /debian/
 
 NZ New Zealand
 --------------
-ftp.nz.debian.org               /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
+ftp.nz.debian.org               /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
   (ftp.citylink.co.nz)
-debian.ihug.co.nz               /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
 
 PF French Polynesia
 -------------------
@@ -473,58 +466,55 @@ repository.linux.pf             /debian/                        /debian/
 
 PL Poland
 ---------
-ftp.pl.debian.org               /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
+ftp.pl.debian.org               /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
   (ftp.task.gda.pl)
-ftp.icm.edu.pl                  /pub/Linux/debian/              /pub/Linux/debian/              alpha amd64 hurd-i386 i386 sparc
-ftp.man.szczecin.pl             /pub/Linux/debian/                                              alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
+ftp.icm.edu.pl                  /pub/Linux/debian/              /pub/Linux/debian/              alpha amd64 hurd-i386 i386 powerpc sparc
+ftp.man.szczecin.pl             /pub/Linux/debian/                                              alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
 ftp.vectranet.pl                /debian/                        /debian/                        amd64 i386
-ftp.pwr.wroc.pl                 /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
-ftp.man.poznan.pl               /pub/linux/debian/debian/       /pub/linux/debian/debian/       alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
+ftp.pwr.wroc.pl                 /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+ftp.man.poznan.pl               /pub/linux/debian/debian/       /pub/linux/debian/debian/       alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
 piotrkosoft.net                 /pub/mirrors/debian/            /pub/mirrors/debian/            amd64 i386
 
 PT Portugal
 -----------
-ftp.pt.debian.org               /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
+ftp.pt.debian.org               /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
   (ftp.uevora.pt)
-ftp.eq.uc.pt                    /pub/software/Linux/debian/     /software/Linux/debian/         alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
-debian.ua.pt                    /debian/                        /debian/                        alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
-ftp.linux.pt                    /pub/mirrors/debian/            /pub/mirrors/debian/            amd64 hurd-i386 i386
-ftp.telepac.pt                  /pub/debian/                                                    amd64 i386 sparc
-mirrors.nfsi.pt                 /pub/debian/                    /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
-neacm.fe.up.pt                  /pub/debian/                    /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
-cesium.di.uminho.pt             /pub/debian/                    /pub/debian/                    alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
-debian.netvisao.pt              /debian/                        /                               alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
+ftp.eq.uc.pt                    /pub/software/Linux/debian/     /software/Linux/debian/         alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+debian.ua.pt                    /debian/                        /debian/                        alpha amd64 arm hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+mirrors.nfsi.pt                 /pub/debian/                    /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+neacm.fe.up.pt                  /pub/debian/                    /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+cesium.di.uminho.pt             /pub/debian/                    /pub/debian/                    alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+debian.netvisao.pt              /debian/                        /                               alpha amd64 arm hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
 debian.dcc.fc.up.pt                                             /debian/                        amd64 i386 ia64 powerpc
-mirror.sim.ul.pt                /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
+mirror.sim.ul.pt                /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
 
 RO Romania
 ----------
-ftp.ro.debian.org               /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
+ftp.ro.debian.org               /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
   (ftp.iasi.roedu.net)
 ftp.lug.ro                      /debian/                        /debian/                        amd64 i386 powerpc
 ftp.mikesnet.ro                 /debian/                        /debian/                        amd64 i386 mips mipsel
 
 RU Russia
 ---------
-ftp.ru.debian.org               /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
+ftp.ru.debian.org               /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
   (ftp.chg.ru)
-debian.nsu.ru                   /debian/                        /debian/                        amd64 i386
 ftp.psn.ru                      /debian/                        /debian/                        alpha amd64 hurd-i386 i386
 ftp.corbina.net                 /debian/                                                        amd64 i386 ia64
-ftp.mipt.ru                     /debian/                                                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
-mirror.yandex.ru                /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
+ftp.mipt.ru                     /debian/                                                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+mirror.yandex.ru                /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
 ftp.debian.chuvsu.ru            /debian/                        /debian/                        amd64 i386
 
 SE Sweden
 ---------
-ftp.se.debian.org               /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
+ftp.se.debian.org               /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
   (ftp.acc.umu.se)
-ftp.sunet.se                    /pub/Linux/distributions/debian//pub/Linux/distributions/debian/alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
-ftp.port80.se                   /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
-ftp.ds.karen.hj.se              /pub/os/linux/debian/           /pub/os/linux/debian/           alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
-debian.lth.se                   /debian/                        /debian/                        alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
-ftp.df.lth.se                   /debian/                                                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
-kalle.csb.ki.se                                                 /debian/                        amd64 arm i386
+ftp.sunet.se                    /pub/Linux/distributions/debian//pub/Linux/distributions/debian/alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+ftp.port80.se                   /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+ftp.ds.karen.hj.se              /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+debian.bsnet.se                 /debian/                        /debian/                        amd64 i386
+debian.lth.se                   /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+ftp.df.lth.se                   /debian/                                                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
 
 SG Singapore
 ------------
@@ -532,127 +522,124 @@ mirror.nus.edu.sg               /pub/Debian/                    /Debian/
 
 SI Slovenia
 -----------
-ftp.si.debian.org               /debian/                        /debian/                        alpha amd64 i386 ia64 m68k powerpc sparc
+ftp.si.debian.org               /debian/                        /debian/                        amd64 i386 powerpc sparc
   (ftp.camtp.uni-mb.si)
 ftp.arnes.si                    /packages/debian/               /pub/packages/debian/           amd64 hurd-i386 i386
-debian.prunk.si                 /debian/                        /debian/                        amd64 i386
+debian.prunk.si                 /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
 
 SK Slovakia
 -----------
-ftp.sk.debian.org               /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
+ftp.sk.debian.org               /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
   (ftp.tuke.sk)
-mirror.ynet.sk                                                  /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
-ftp.debian.sk                   /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
-ftp.antik.sk                    /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
+debian.ynet.sk                  /debian/                                                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+ftp.debian.sk                   /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+ftp.antik.sk                    /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
 
 SV El Salvador
 --------------
-debian.ues.edu.sv               /debian/                        /debian/                        amd64 i386 ia64
+debian.ues.edu.sv                                               /debian/                        amd64 i386 ia64
 
 TH Thailand
 -----------
 ftp.coe.psu.ac.th               /debian/                        /debian/                        i386
-ftp.thaios.net                                                  /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
+debian.thaios.net                                               /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
 ftp.debianclub.org              /debian/                        /debian/                        amd64 i386
 
 TR Turkey
 ---------
-ftp.tr.debian.org               /debian/                        /debian/                        alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
+ftp.tr.debian.org               /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
   (debian.ankara.edu.tr)
 ftp.linux.org.tr                /debian/                        /debian/                        amd64 i386
 godel.cs.bilgi.edu.tr           /debian/                        /debian/                        hurd-i386 i386
 debian.eso-es.net                                               /debian/                        amd64 i386 ia64 sparc
 debian.comu.edu.tr              /debian/                        /debian/                        amd64 i386 ia64 powerpc sparc
-ftp.metu.edu.tr                 /debian/                        /debian/                        ALL alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
+ftp.metu.edu.tr                 /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
 
 TW Taiwan
 ---------
-ftp.tw.debian.org               /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
+ftp.tw.debian.org               /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
   (debian.linux.org.tw)
 debian.csie.ntu.edu.tw          /pub/debian/                    /debian/                        amd64 hurd-i386 i386
-ftp.twaren.net                  /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
-opensource.nchc.org.tw          /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
-ftp.isu.edu.tw                  /debian/                        /debian/                        alpha amd64 arm armel hppa i386 ia64 m68k mips mipsel powerpc s390 sparc
-debian.nctu.edu.tw              /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
-mirror.nttu.edu.tw              /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
-debian.csie.nctu.edu.tw         /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
-ftp.ncnu.edu.tw                 /Linux/Debian/debian/           /Linux/Debian/debian/           alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
-ftp.cse.yzu.edu.tw              /pub/Linux/debian/debian/       /pub/Linux/debian/debian/       alpha amd64 arm armel hppa i386 ia64 m68k mips mipsel powerpc s390 sparc
+ftp.twaren.net                  /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+opensource.nchc.org.tw          /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+ftp.isu.edu.tw                  /debian/                        /debian/                        alpha amd64 arm armel hppa i386 ia64 mips mipsel powerpc s390 sparc
+debian.nctu.edu.tw              /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+mirror.nttu.edu.tw              /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+debian.csie.nctu.edu.tw         /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+ftp.cse.yzu.edu.tw              /pub/Linux/debian/debian/       /pub/Linux/debian/debian/       alpha amd64 arm armel hppa i386 ia64 mips mipsel powerpc s390 sparc
 
 UA Ukraine
 ----------
+ftp.ua.debian.org               /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+  (debian.org.ua)
 debian.osdn.org.ua              /pub/Debian/debian/             /debian/                        i386
-debian.org.ua                   /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
 ftp.3logic.net                  /debian/                                                        amd64 i386
 mirror.mirohost.net             /debian/                        /debian/                        amd64 i386
 ftp2.debian.org.ua              /debian/                        /debian/                        amd64 i386
 
 US United States
 ----------------
-ftp.us.debian.org               /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
+ftp.us.debian.org               /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
   (ftp.egr.msu.edu, mirrors.kernel.org, debian.osuosl.org, debian.lcs.mit.edu)
-ftp.gtlib.gatech.edu            /pub/debian/                    /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
-ftp.egr.msu.edu                 /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
+ftp.gtlib.gatech.edu            /pub/debian/                    /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+ftp.egr.msu.edu                 /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
 distro.ibiblio.org              /pub/linux/distributions/debian//debian/                        amd64 i386 ia64
-ftp-mirror.internap.com         /pub/debian/                    /pub/debian/                    alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
-ftp.cerias.purdue.edu           /pub/os/debian/                 /pub/os/debian/                 amd64 hurd-i386 i386 ia64 powerpc sparc
+ftp-mirror.internap.com         /pub/debian/                    /pub/debian/                    alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
 mirror.cs.wisc.edu              /pub/mirrors/linux/debian/      /pub/mirrors/linux/debian/      amd64 i386
-ftp.uwsg.indiana.edu            /linux/debian/                  /linux/debian/                  alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
-natasha.stmarytx.edu            /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
-ftp.ndlug.nd.edu                /debian/                        /mirrors/debian/                alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
-debian.uchicago.edu             /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
-carroll.aset.psu.edu            /pub/linux/distributions/debian//pub/linux/distributions/debian/alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
+ftp.uwsg.indiana.edu            /linux/debian/                  /linux/debian/                  alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+natasha.stmarytx.edu            /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+ftp.ndlug.nd.edu                /debian/                        /mirrors/debian/                alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+debian.uchicago.edu             /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+carroll.aset.psu.edu            /pub/linux/distributions/debian//pub/linux/distributions/debian/alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
 gladiator.real-time.com         /linux/debian/                                                  alpha amd64 i386 powerpc sparc
-mirrors.kernel.org              /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
+mirrors.kernel.org              /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
 mirrors.xmission.com            /debian/                        /debian/                        amd64 hurd-i386 i386 powerpc sparc
 ftp.lug.udel.edu                /pub/debian/                    /pub/debian/                    amd64 hurd-i386 i386 powerpc sparc
-debian.lcs.mit.edu              /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
-linux.csua.berkeley.edu                                         /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
+debian.lcs.mit.edu              /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+linux.csua.berkeley.edu                                         /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
 ftp.silug.org                   /pub/debian/                    /pub/debian/                    alpha amd64 arm armel hppa i386 mips mipsel powerpc sparc
-debian.secsup.org               /pub/linux/debian/              /                               alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
-debian.osuosl.org               /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
-mirror.anl.gov                  /pub/debian/                    /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
+debian.secsup.org               /pub/linux/debian/              /                               alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+debian.osuosl.org               /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+mirror.anl.gov                  /pub/debian/                    /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
 sluglug.ucsc.edu                                                /debian/                        amd64 hurd-i386 i386 powerpc sparc
 mirrors.geeks.org               /debian/                        /debian/                        amd64 i386
-mirrors.usc.edu                 /pub/linux/distributions/debian//pub/linux/distributions/debian/alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
-debian.mirrors.pair.com         /                               /                               alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
+mirrors.usc.edu                 /pub/linux/distributions/debian//pub/linux/distributions/debian/alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+debian.mirrors.pair.com         /                               /                               alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
 lug.mtu.edu                     /debian/                        /debian/                        alpha amd64 hppa i386 mips mipsel powerpc sparc
-debian.mirrors.tds.net          /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
+debian.mirrors.tds.net          /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
 debian.cites.uiuc.edu           /pub/debian/                    /pub/debian/                    amd64 hurd-i386 i386 ia64 powerpc sparc
-mirrors.tummy.com               /debian/                        /debian/                        alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
-debian.mirror.frontiernet.net   /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
-cudlug.cudenver.edu             /debian/                        /debian/                        alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
-bigmirror.crossbowproject.net   /pub/debian/                                                    alpha arm armel hppa i386 ia64 m68k mips mipsel powerpc s390 sparc
+mirrors.tummy.com               /debian/                        /debian/                        alpha amd64 arm hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+debian.mirror.frontiernet.net   /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+cudlug.cudenver.edu                                             /debian/                        alpha amd64 arm hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
 mirror.cc.columbia.edu          /pub/linux/debian/debian/       /pub/linux/debian/debian/       amd64 i386 powerpc
 ftp.grokthis.net                /mirrors/debian/                                                amd64 i386
 mirrors.xenir.com                                               /debian/                        amd64 arm armel i386 powerpc
 debian.mirrors.easynews.com                                     /linux/debian/                  amd64 i386
-debian.ams.sunysb.edu                                           /debian/                        alpha amd64 arm armel hppa hurd-i386 ia64 m68k mips mipsel powerpc s390 sparc
-mirrors.acm.jhu.edu                                             /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
+debian.ams.sunysb.edu                                           /debian/                        alpha amd64 arm armel hppa hurd-i386 ia64 mips mipsel powerpc s390 sparc
+mirrors.acm.jhu.edu                                             /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
 ftp.uga.edu                     /debian/                        /debian/                        i386
 mirror.steadfast.net                                            /debian/                        amd64 i386
-ftp.utexas.edu                  /pub/debian/                    /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
+ftp.utexas.edu                  /pub/debian/                    /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
 mirror.fdcservers.net           /debian/                        /debian/                        amd64 i386
 mirror.rit.edu                  /debian/                        /debian/                        alpha amd64 arm armel i386 powerpc sparc
 debian.corenetworks.net                                         /debian/                        amd64 i386
-mirror.its.uidaho.edu           /debian/                        /pub/debian/                    alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
-debian.cs.binghamton.edu        /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
+mirror.its.uidaho.edu           /debian/                        /pub/debian/                    alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+debian.cs.binghamton.edu        /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+mirror.hmc.edu                                                  /debian/                        amd64 hppa i386 powerpc
 
 UZ Uzbekistan
 -------------
-debian.snet.uz                                                  /debian/                        amd64 i386
-debian.stream.uz                /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
+debian.stream.uz                /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
 
 VE Venezuela
 ------------
-debian.unesr.edu.ve                                             /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
-ftp.ula.ve                      /debian/                        /debian/                        alpha amd64 i386 ia64 powerpc sparc
+debian.unesr.edu.ve                                             /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
 
 ZA South Africa
 ---------------
 ftp.sun.ac.za                   /debian/                        /ftp/debian/                    amd64 i386
-debian.mirror.ac.za             /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
-ftp.is.co.za                    /debian/                                                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
+debian.mirror.ac.za             /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+ftp.is.co.za                    /debian/                                                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
 
 -------------------------------------------------------------------------------
-Last modified: Sun Nov  2 19:52:19 2008             Number of sites listed: 417
+Last modified: Sun Feb  8 01:52:17 2009             Number of sites listed: 415
diff --git a/includes/lenny/install/README.txt b/includes/lenny/install/README.txt
index 64ca8c8..a37a801 100644
--- a/includes/lenny/install/README.txt
+++ b/includes/lenny/install/README.txt
@@ -1,6 +1,6 @@
 

-      Debian GNU/Linux testing "Lenny" - Official RC i386 BC Binary-1

-                               20081104-23:45

+     Debian GNU/Linux testing "Lenny" - Official Snapshot i386 NETINST

+                          Binary-1 20090208-03:19

 

                                             (HTML version in README.html)

 

@@ -48,14 +48,14 @@ About This Disc
 

    This disc is labeled

 

-      Debian GNU/Linux testing "Lenny" - Official RC i386 BC Binary-1

-                               20081104-23:45

+     Debian GNU/Linux testing "Lenny" - Official Snapshot i386 NETINST

+                          Binary-1 20090208-03:19

 

    It contains programs ("binaries") for `i386' computers.

 

-   This disc is a business card image. It contains only the installer and

-   will download the base system and the remaining packages from the

-   network.

+   This disc is a netinst image. It contains the installer and a very

+   basic system. Any other packages you might want to install will be

+   downloaded from the network.

 

    The Release Notes for "lenny" are available on the Debian web site.

 

@@ -69,9 +69,6 @@ Installing
    An Installation Guide for this disc is available from the Debian web

    site.

 

-   Programs and other files that are needed for the installation can be

-   found on this disc under /tools/ and /install/floppy/

-

    For the impatient ones: you can start the installation program easily

    by booting off this disc. Note that not all (esp. older) systems

    support this.

@@ -82,10 +79,14 @@ Installing
 Last-Minute Notes

 =================

 

-     * You should keep in mind that this is an unofficial disc of the

-       Debian system. This means that all sorts of bugs may be present

-       anywhere in the system. Please report any bugs you find to the

-       person that gave you this disc, not Debian.

+     * You should keep in mind that this is a beta disc of the current

+       development version of the Debian system. This means that all

+       sorts of bugs may be present anywhere in the system. Please report

+       any bugs you find in the Debian Bug Tracking System; details at

+       bugs.debian.org.

+     * If you're reporting bugs against this disc or the installation

+       system, please also mention the version of this disc; this can be

+       found in the file /.disk/info.

 

 Installing software using Apt

 =============================

diff --git a/includes/lenny/install/tools/README b/includes/lenny/install/tools/README
deleted file mode 100644
index bc56f93..0000000
--- a/includes/lenny/install/tools/README
+++ /dev/null
@@ -1,13 +0,0 @@
-/debian/tools contains MS-DOS tools for installing and booting Linux.
-
-fips20.zip     Non-destructively split harddisk partitions (works with FAT32)
-gzip124.exe    gzip for DOS
-lodlin16.zip   load Linux kernel from DOS
-rawrite1.zip   rawrite version 1.3             (rawrite 2.0 is much faster, but
-rawrite2.zip   rawrite version 2.0               it locks up on some machines.)
-unz512x3.exe   Info-ZIP's free UnZipper for DOS
-rwwrtwin.zip   Win32 version of rawrite runs on Windows 95, NT, 98, 2000, 
-               ME, XP and probably later versions.
-diskio.zip     Under 95, 98 & ME you need diskio.dll.  It must be in 
-               the same directory as rwwrtwin.exe. (uncompressed)
-md5sum-w32.zip Win32 version of md5sum
diff --git a/includes/lenny/install/tools/diskio.zip b/includes/lenny/install/tools/diskio.zip
deleted file mode 100644
index b30fa96..0000000
--- a/includes/lenny/install/tools/diskio.zip
+++ /dev/null
diff --git a/includes/lenny/install/tools/fips20.zip b/includes/lenny/install/tools/fips20.zip
deleted file mode 100644
index c4a64b6..0000000
--- a/includes/lenny/install/tools/fips20.zip
+++ /dev/null
diff --git a/includes/lenny/install/tools/gzip124.exe b/includes/lenny/install/tools/gzip124.exe
deleted file mode 100644
index 1a8d137..0000000
--- a/includes/lenny/install/tools/gzip124.exe
+++ /dev/null
diff --git a/includes/lenny/install/tools/lodlin16.zip b/includes/lenny/install/tools/lodlin16.zip
deleted file mode 100644
index b86310a..0000000
--- a/includes/lenny/install/tools/lodlin16.zip
+++ /dev/null
diff --git a/includes/lenny/install/tools/md5sum-w32.zip b/includes/lenny/install/tools/md5sum-w32.zip
deleted file mode 100644
index 982202b..0000000
--- a/includes/lenny/install/tools/md5sum-w32.zip
+++ /dev/null
diff --git a/includes/lenny/install/tools/rawrite1.zip b/includes/lenny/install/tools/rawrite1.zip
deleted file mode 100644
index abdc229..0000000
--- a/includes/lenny/install/tools/rawrite1.zip
+++ /dev/null
diff --git a/includes/lenny/install/tools/rawrite2.zip b/includes/lenny/install/tools/rawrite2.zip
deleted file mode 100644
index aa33885..0000000
--- a/includes/lenny/install/tools/rawrite2.zip
+++ /dev/null
diff --git a/includes/lenny/install/tools/rwwrtwin.zip b/includes/lenny/install/tools/rwwrtwin.zip
deleted file mode 100644
index 2c3fd11..0000000
--- a/includes/lenny/install/tools/rwwrtwin.zip
+++ /dev/null
diff --git a/includes/lenny/install/tools/src/md5sum-w32_1.1.dsc b/includes/lenny/install/tools/src/md5sum-w32_1.1.dsc
deleted file mode 100644
index 44393f8..0000000
--- a/includes/lenny/install/tools/src/md5sum-w32_1.1.dsc
+++ /dev/null
@@ -1,25 +0,0 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-Format: 1.0
-Source: md5sum-w32
-Version: 1.1
-Binary: md5sum-w32
-Maintainer: Bas Zoetekouw <bas@debian.org>
-Architecture: any
-Standards-Version: 3.5.2
-Build-Depends: debhelper (>> 3.0.0), mingw32, zip
-Files: 
- b5741a5c7e027ee1e9242163c5eb711b 7617 md5sum-w32_1.1.tar.gz
-
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.0.7 (GNU/Linux)
-
-iQEXAwUBPXo9/Z6S+2TcVAFTFAKpcwP/bDWljR/VQxCFtjg4epqZczN5MRWHQ0Qc
-qjRw5F0of0V0jELCVClRGl68VBX96o3tJSGvhCkXqT3UXQYd1vsiakHQotcEib3V
-r07De88Bzxm9NE43AR/98TU+9niIkrOmkbxGJQXU3puKMXd/WpCw4XgNOYT6A1hg
-7ugByZ32x9ID/RtIpCehPvrqCVn8J1v2dTam3m3obGt6yESg+2PcxzEeIVwN3jb3
-AwkLTKi7VyelSmMWPdJUxsMZvGmBFyjjNqwZeMYPnuGS60sHxREHA/heDsM1hIbS
-7PZ9hcPXw588Y79ItGFZY4Rfdc0cJQSTkPvt2z5gAk1Eeii5kzCC25nZ
-=aPY9
------END PGP SIGNATURE-----
diff --git a/includes/lenny/install/tools/src/md5sum-w32_1.1.tar.gz b/includes/lenny/install/tools/src/md5sum-w32_1.1.tar.gz
deleted file mode 100644
index bf42ec8..0000000
--- a/includes/lenny/install/tools/src/md5sum-w32_1.1.tar.gz
+++ /dev/null
diff --git a/includes/lenny/install/tools/unz512x3.exe b/includes/lenny/install/tools/unz512x3.exe
deleted file mode 100644
index e8b36c8..0000000
--- a/includes/lenny/install/tools/unz512x3.exe
+++ /dev/null