Updating includes for squeeze.

34 files changed, 2333 insertions, 1486 deletions

diff --git a/includes/squeeze/common/doc/FAQ/debian-faq.en.html.tar.gz b/includes/squeeze/common/doc/FAQ/debian-faq.en.html.tar.gz
index abee0f971..a1eb63445 100644
--- a/includes/squeeze/common/doc/FAQ/debian-faq.en.html.tar.gz
+++ b/includes/squeeze/common/doc/FAQ/debian-faq.en.html.tar.gz
diff --git a/includes/squeeze/common/doc/FAQ/debian-faq.en.pdf.gz b/includes/squeeze/common/doc/FAQ/debian-faq.en.pdf.gz
index 3b428a113..e7c835a02 100644
--- a/includes/squeeze/common/doc/FAQ/debian-faq.en.pdf.gz
+++ b/includes/squeeze/common/doc/FAQ/debian-faq.en.pdf.gz
diff --git a/includes/squeeze/common/doc/FAQ/debian-faq.en.ps.gz b/includes/squeeze/common/doc/FAQ/debian-faq.en.ps.gz
index 0ff09491e..6d744f7b0 100644
--- a/includes/squeeze/common/doc/FAQ/debian-faq.en.ps.gz
+++ b/includes/squeeze/common/doc/FAQ/debian-faq.en.ps.gz
diff --git a/includes/squeeze/common/doc/FAQ/debian-faq.en.txt.gz b/includes/squeeze/common/doc/FAQ/debian-faq.en.txt.gz
index aeaaa4122..87b535cb6 100644
--- a/includes/squeeze/common/doc/FAQ/debian-faq.en.txt.gz
+++ b/includes/squeeze/common/doc/FAQ/debian-faq.en.txt.gz
diff --git a/includes/squeeze/common/doc/FAQ/html/ch-basic_defs.en.html b/includes/squeeze/common/doc/FAQ/html/ch-basic_defs.en.html
index cc5565314..5d0babb9c 100644
--- a/includes/squeeze/common/doc/FAQ/html/ch-basic_defs.en.html
+++ b/includes/squeeze/common/doc/FAQ/html/ch-basic_defs.en.html
@@ -597,7 +597,7 @@ The Debian GNU/Linux FAQ
 </p>
 
 <address>
-version 4.0.3, 6 August 2008<br>
+version 4.0.4+nmu1, 3 January 2010<br>
 <br>
 Authors are listed at <a href="ch-faqinfo.en.html#s-authors">Debian FAQ Authors</a><br>
 <br>
diff --git a/includes/squeeze/common/doc/FAQ/html/ch-choosing.en.html b/includes/squeeze/common/doc/FAQ/html/ch-choosing.en.html
index e0403cc09..af1f232ae 100644
--- a/includes/squeeze/common/doc/FAQ/html/ch-choosing.en.html
+++ b/includes/squeeze/common/doc/FAQ/html/ch-choosing.en.html
@@ -948,7 +948,7 @@ The Debian GNU/Linux FAQ
 </p>
 
 <address>
-version 4.0.3, 6 August 2008<br>
+version 4.0.4+nmu1, 3 January 2010<br>
 <br>
 Authors are listed at <a href="ch-faqinfo.en.html#s-authors">Debian FAQ Authors</a><br>
 <br>
diff --git a/includes/squeeze/common/doc/FAQ/html/ch-compat.en.html b/includes/squeeze/common/doc/FAQ/html/ch-compat.en.html
index 375bff45d..7d9ea1562 100644
--- a/includes/squeeze/common/doc/FAQ/html/ch-compat.en.html
+++ b/includes/squeeze/common/doc/FAQ/html/ch-compat.en.html
@@ -541,7 +541,7 @@ The Debian GNU/Linux FAQ
 </p>
 
 <address>
-version 4.0.3, 6 August 2008<br>
+version 4.0.4+nmu1, 3 January 2010<br>
 <br>
 Authors are listed at <a href="ch-faqinfo.en.html#s-authors">Debian FAQ Authors</a><br>
 <br>
diff --git a/includes/squeeze/common/doc/FAQ/html/ch-contributing.en.html b/includes/squeeze/common/doc/FAQ/html/ch-contributing.en.html
index db2d6e329..607a72bbd 100644
--- a/includes/squeeze/common/doc/FAQ/html/ch-contributing.en.html
+++ b/includes/squeeze/common/doc/FAQ/html/ch-contributing.en.html
@@ -357,7 +357,7 @@ The Debian GNU/Linux FAQ
 </p>
 
 <address>
-version 4.0.3, 6 August 2008<br>
+version 4.0.4+nmu1, 3 January 2010<br>
 <br>
 Authors are listed at <a href="ch-faqinfo.en.html#s-authors">Debian FAQ Authors</a><br>
 <br>
diff --git a/includes/squeeze/common/doc/FAQ/html/ch-customizing.en.html b/includes/squeeze/common/doc/FAQ/html/ch-customizing.en.html
index 94671123b..e112c5386 100644
--- a/includes/squeeze/common/doc/FAQ/html/ch-customizing.en.html
+++ b/includes/squeeze/common/doc/FAQ/html/ch-customizing.en.html
@@ -703,7 +703,7 @@ The Debian GNU/Linux FAQ
 </p>
 
 <address>
-version 4.0.3, 6 August 2008<br>
+version 4.0.4+nmu1, 3 January 2010<br>
 <br>
 Authors are listed at <a href="ch-faqinfo.en.html#s-authors">Debian FAQ Authors</a><br>
 <br>
diff --git a/includes/squeeze/common/doc/FAQ/html/ch-faqinfo.en.html b/includes/squeeze/common/doc/FAQ/html/ch-faqinfo.en.html
index 9edac2076..5349d74f2 100644
--- a/includes/squeeze/common/doc/FAQ/html/ch-faqinfo.en.html
+++ b/includes/squeeze/common/doc/FAQ/html/ch-faqinfo.en.html
@@ -394,7 +394,7 @@ The Debian GNU/Linux FAQ
 </p>
 
 <address>
-version 4.0.3, 6 August 2008<br>
+version 4.0.4+nmu1, 3 January 2010<br>
 <br>
 Authors are listed at <a href="ch-faqinfo.en.html#s-authors">Debian FAQ Authors</a><br>
 <br>
diff --git a/includes/squeeze/common/doc/FAQ/html/ch-ftparchives.en.html b/includes/squeeze/common/doc/FAQ/html/ch-ftparchives.en.html
index 0efd28ab9..71b92a5dd 100644
--- a/includes/squeeze/common/doc/FAQ/html/ch-ftparchives.en.html
+++ b/includes/squeeze/common/doc/FAQ/html/ch-ftparchives.en.html
@@ -743,7 +743,7 @@ The Debian GNU/Linux FAQ
 </p>
 
 <address>
-version 4.0.3, 6 August 2008<br>
+version 4.0.4+nmu1, 3 January 2010<br>
 <br>
 Authors are listed at <a href="ch-faqinfo.en.html#s-authors">Debian FAQ Authors</a><br>
 <br>
diff --git a/includes/squeeze/common/doc/FAQ/html/ch-getting.en.html b/includes/squeeze/common/doc/FAQ/html/ch-getting.en.html
index 16d506c41..cc28eeddb 100644
--- a/includes/squeeze/common/doc/FAQ/html/ch-getting.en.html
+++ b/includes/squeeze/common/doc/FAQ/html/ch-getting.en.html
@@ -438,7 +438,7 @@ The Debian GNU/Linux FAQ
 </p>
 
 <address>
-version 4.0.3, 6 August 2008<br>
+version 4.0.4+nmu1, 3 January 2010<br>
 <br>
 Authors are listed at <a href="ch-faqinfo.en.html#s-authors">Debian FAQ Authors</a><br>
 <br>
diff --git a/includes/squeeze/common/doc/FAQ/html/ch-kernel.en.html b/includes/squeeze/common/doc/FAQ/html/ch-kernel.en.html
index 58781c998..995f64819 100644
--- a/includes/squeeze/common/doc/FAQ/html/ch-kernel.en.html
+++ b/includes/squeeze/common/doc/FAQ/html/ch-kernel.en.html
@@ -376,7 +376,7 @@ The Debian GNU/Linux FAQ
 </p>
 
 <address>
-version 4.0.3, 6 August 2008<br>
+version 4.0.4+nmu1, 3 January 2010<br>
 <br>
 Authors are listed at <a href="ch-faqinfo.en.html#s-authors">Debian FAQ Authors</a><br>
 <br>
diff --git a/includes/squeeze/common/doc/FAQ/html/ch-nexttime.en.html b/includes/squeeze/common/doc/FAQ/html/ch-nexttime.en.html
index cd6c875e5..0b2724860 100644
--- a/includes/squeeze/common/doc/FAQ/html/ch-nexttime.en.html
+++ b/includes/squeeze/common/doc/FAQ/html/ch-nexttime.en.html
@@ -364,7 +364,7 @@ The Debian GNU/Linux FAQ
 </p>
 
 <address>
-version 4.0.3, 6 August 2008<br>
+version 4.0.4+nmu1, 3 January 2010<br>
 <br>
 Authors are listed at <a href="ch-faqinfo.en.html#s-authors">Debian FAQ Authors</a><br>
 <br>
diff --git a/includes/squeeze/common/doc/FAQ/html/ch-pkg_basics.en.html b/includes/squeeze/common/doc/FAQ/html/ch-pkg_basics.en.html
index 72799b217..d67b3d7a2 100644
--- a/includes/squeeze/common/doc/FAQ/html/ch-pkg_basics.en.html
+++ b/includes/squeeze/common/doc/FAQ/html/ch-pkg_basics.en.html
@@ -1110,7 +1110,7 @@ The Debian GNU/Linux FAQ
 </p>
 
 <address>
-version 4.0.3, 6 August 2008<br>
+version 4.0.4+nmu1, 3 January 2010<br>
 <br>
 Authors are listed at <a href="ch-faqinfo.en.html#s-authors">Debian FAQ Authors</a><br>
 <br>
diff --git a/includes/squeeze/common/doc/FAQ/html/ch-pkgtools.en.html b/includes/squeeze/common/doc/FAQ/html/ch-pkgtools.en.html
index 391e6560f..763c63acf 100644
--- a/includes/squeeze/common/doc/FAQ/html/ch-pkgtools.en.html
+++ b/includes/squeeze/common/doc/FAQ/html/ch-pkgtools.en.html
@@ -1186,7 +1186,7 @@ The Debian GNU/Linux FAQ
 </p>
 
 <address>
-version 4.0.3, 6 August 2008<br>
+version 4.0.4+nmu1, 3 January 2010<br>
 <br>
 Authors are listed at <a href="ch-faqinfo.en.html#s-authors">Debian FAQ Authors</a><br>
 <br>
diff --git a/includes/squeeze/common/doc/FAQ/html/ch-redistrib.en.html b/includes/squeeze/common/doc/FAQ/html/ch-redistrib.en.html
index 77bbf561b..6a2b65d87 100644
--- a/includes/squeeze/common/doc/FAQ/html/ch-redistrib.en.html
+++ b/includes/squeeze/common/doc/FAQ/html/ch-redistrib.en.html
@@ -327,7 +327,7 @@ The Debian GNU/Linux FAQ
 </p>
 
 <address>
-version 4.0.3, 6 August 2008<br>
+version 4.0.4+nmu1, 3 January 2010<br>
 <br>
 Authors are listed at <a href="ch-faqinfo.en.html#s-authors">Debian FAQ Authors</a><br>
 <br>
diff --git a/includes/squeeze/common/doc/FAQ/html/ch-software.en.html b/includes/squeeze/common/doc/FAQ/html/ch-software.en.html
index 2c2d7458e..e2beb961d 100644
--- a/includes/squeeze/common/doc/FAQ/html/ch-software.en.html
+++ b/includes/squeeze/common/doc/FAQ/html/ch-software.en.html
@@ -626,7 +626,7 @@ The Debian GNU/Linux FAQ
 </p>
 
 <address>
-version 4.0.3, 6 August 2008<br>
+version 4.0.4+nmu1, 3 January 2010<br>
 <br>
 Authors are listed at <a href="ch-faqinfo.en.html#s-authors">Debian FAQ Authors</a><br>
 <br>
diff --git a/includes/squeeze/common/doc/FAQ/html/ch-support.en.html b/includes/squeeze/common/doc/FAQ/html/ch-support.en.html
index 5036cb539..a078153a5 100644
--- a/includes/squeeze/common/doc/FAQ/html/ch-support.en.html
+++ b/includes/squeeze/common/doc/FAQ/html/ch-support.en.html
@@ -666,7 +666,7 @@ The Debian GNU/Linux FAQ
 </p>
 
 <address>
-version 4.0.3, 6 August 2008<br>
+version 4.0.4+nmu1, 3 January 2010<br>
 <br>
 Authors are listed at <a href="ch-faqinfo.en.html#s-authors">Debian FAQ Authors</a><br>
 <br>
diff --git a/includes/squeeze/common/doc/FAQ/html/ch-uptodate.en.html b/includes/squeeze/common/doc/FAQ/html/ch-uptodate.en.html
index 33cc9f08e..5f13eb5ba 100644
--- a/includes/squeeze/common/doc/FAQ/html/ch-uptodate.en.html
+++ b/includes/squeeze/common/doc/FAQ/html/ch-uptodate.en.html
@@ -623,7 +623,7 @@ The Debian GNU/Linux FAQ
 </p>
 
 <address>
-version 4.0.3, 6 August 2008<br>
+version 4.0.4+nmu1, 3 January 2010<br>
 <br>
 Authors are listed at <a href="ch-faqinfo.en.html#s-authors">Debian FAQ Authors</a><br>
 <br>
diff --git a/includes/squeeze/common/doc/FAQ/html/footnotes.en.html b/includes/squeeze/common/doc/FAQ/html/footnotes.en.html
index 881269fa1..eede4011b 100644
--- a/includes/squeeze/common/doc/FAQ/html/footnotes.en.html
+++ b/includes/squeeze/common/doc/FAQ/html/footnotes.en.html
@@ -281,7 +281,7 @@ The Debian GNU/Linux FAQ
 </p>
 
 <address>
-version 4.0.3, 6 August 2008<br>
+version 4.0.4+nmu1, 3 January 2010<br>
 <br>
 Authors are listed at <a href="ch-faqinfo.en.html#s-authors">Debian FAQ Authors</a><br>
 <br>
diff --git a/includes/squeeze/common/doc/FAQ/html/index.en.html b/includes/squeeze/common/doc/FAQ/html/index.en.html
index c7115e0d1..7575c572b 100644
--- a/includes/squeeze/common/doc/FAQ/html/index.en.html
+++ b/includes/squeeze/common/doc/FAQ/html/index.en.html
@@ -509,7 +509,7 @@ The Debian GNU/Linux FAQ
 </p>
 
 <address>
-version 4.0.3, 6 August 2008<br>
+version 4.0.4+nmu1, 3 January 2010<br>
 <br>
 Authors are listed at <a href="ch-faqinfo.en.html#s-authors">Debian FAQ Authors</a><br>
 <br>
diff --git a/includes/squeeze/common/doc/bug-log-access.txt b/includes/squeeze/common/doc/bug-log-access.txt
index c8fa75f57..748b01633 100644
--- a/includes/squeeze/common/doc/bug-log-access.txt
+++ b/includes/squeeze/common/doc/bug-log-access.txt
@@ -1,12 +1,10 @@
-Methods of accessing the bug tracking system logs
-
 Accessing active bug reports
 
-   Each message received at or sent by the bug processing system is
-   logged and made available in a number of ways.
+   Each message received at or sent by the bug processing system is logged
+   and made available in a number of ways.
 
-   The primary access method is to use the web pages. See the forms on
-   the main BTS page at http://bugs.debian.org/
+   The primary access method is to use the web pages. See the forms on the
+   main BTS page at http://bugs.debian.org/
 
    There is a mailserver which can send bug reports as plain text on
    request. To use it send the word help as the sole contents of an email
@@ -18,9 +16,8 @@ Accessing archived bug reports
 
    Each closed bug report is archived 28 days after the last message
    relating to it is received and filed. This means that it is no longer
-   possible to access it or change anything about it using the control
-   and service bots. However, the reports are still accessible for
-   viewing.
+   possible to access it or change anything about it using the control and
+   service bots. However, the reports are still accessible for viewing.
 
    You can search the bug report archive using the WWW forms at
    http://bugs.debian.org/, simply select the "archived bugs" option.
@@ -44,12 +41,12 @@ Accessing the raw bug data
    Please do not rely on *.status files in the bug spools, as they are
    obsolete, for compatibility purposes only, and will be removed at some
    point in the future. Use the *.summary files instead.
-     _________________________________________________________________
+     __________________________________________________________________
 
     Debian BTS administrators <owner@bugs.debian.org>
 
    Debian bug tracking system
    Copyright © 1999 Darren O. Benham, 1997, 2003 nCipher Corporation Ltd,
    1994-1997 Ian Jackson.
-     _________________________________________________________________
+     __________________________________________________________________
 
diff --git a/includes/squeeze/common/doc/bug-log-mailserver.txt b/includes/squeeze/common/doc/bug-log-mailserver.txt
index 447a059f7..764d25a9e 100644
--- a/includes/squeeze/common/doc/bug-log-mailserver.txt
+++ b/includes/squeeze/common/doc/bug-log-mailserver.txt
@@ -1,32 +1,30 @@
-Introduction to the bug system request server
-
    There is a mailserver which can send the bug reports and indices as
    plain text on request.
 
    To use it you send a mail message to request@bugs.debian.org. The
-   Subject of the message is ignored, except for generating the Subject
-   of the reply.
+   Subject of the message is ignored, except for generating the Subject of
+   the reply.
 
    The body you send should be a series of commands, one per line. You'll
    receive a reply which looks like a transcript of your message being
-   interpreted, with a response to each command. No notifications are
-   sent to anyone for the commands listed here and the mail isn't logged
+   interpreted, with a response to each command. No notifications are sent
+   to anyone for the commands listed here and the mail isn't logged
    anywhere publicly available.
 
    Any text on a line starting with a hash sign # is ignored; the server
    will stop processing when it finds a line with a control terminator (
-   quit, thank you, or two hyphens are common examples). It will also
-   stop if it encounters too many unrecognised or badly-formatted
-   commands. If no commands are successfully handled it will send the
-   help text for the server.
+   quit, thank you, or two hyphens are common examples). It will also stop
+   if it encounters too many unrecognised or badly-formatted commands. If
+   no commands are successfully handled it will send the help text for the
+   server.
 
 Commands available
 
    send bugnumber
    send-detail bugnumber
           Requests the transcript for the bug report in question.
-          send-detail sends all of the "boring" messages in the
-          transcript as well, such as the various auto-acks.
+          send-detail sends all of the "boring" messages in the transcript
+          as well, such as the various auto-acks.
 
    index [full]
    index-summary by-package
@@ -36,8 +34,8 @@ Commands available
           number, respectively.
 
    index-maint
-          Requests the index page giving the list of maintainers with
-          bugs (open and recently-closed) in the tracking system.
+          Requests the index page giving the list of maintainers with bugs
+          (open and recently-closed) in the tracking system.
 
    index maint maintainer
           Requests the index pages of bugs in the system for the
@@ -57,8 +55,8 @@ Commands available
    send-unmatched last|-1
    send-unmatched old|-2
           Requests logs of messages not matched to a particular bug
-          report, for this week, last week and the week before. (Each
-          week ends on a Wednesday.)
+          report, for this week, last week and the week before. (Each week
+          ends on a Wednesday.)
 
    getinfo filename
           Request a file containing information about package(s) and or
@@ -102,19 +100,18 @@ Commands available
    --
           Stops processing at this point of the message. After this you
           may include any text you like, and it will be ignored. You can
-          use this to include longer comments than are suitable for #,
-          for example for the benefit of human readers of your message
-          (reading it via the tracking system logs or due to a CC or
-          BCC).
+          use this to include longer comments than are suitable for #, for
+          example for the benefit of human readers of your message
+          (reading it via the tracking system logs or due to a CC or BCC).
 
    #...
           One-line comment. The # must be at the start of the line.
 
    debug level
-          Sets the debugging level to level, which should be a
-          nonnegative integer. 0 is no debugging; 1 is usually
-          sufficient. The debugging output appears in the transcript. It
-          is not likely to be useful to general users of the bug system.
+          Sets the debugging level to level, which should be a nonnegative
+          integer. 0 is no debugging; 1 is usually sufficient. The
+          debugging output appears in the transcript. It is not likely to
+          be useful to general users of the bug system.
 
    There is a reference card for the mailservers, available via the WWW,
    in bug-mailserver-refcard.txt or by email using the refcard command
@@ -122,19 +119,19 @@ Commands available
 
    If you wish to manipulate bug reports you should use the
    control@bugs.debian.org address, which understands a superset of the
-   commands listed above. This is described in another document,
-   available on the WWW, in the file bug-maint-mailcontrol.txt, or by
-   sending help to control@bugs.
+   commands listed above. This is described in another document, available
+   on the WWW, in the file bug-maint-mailcontrol.txt, or by sending help
+   to control@bugs.
 
-   In case you are reading this as a plain text file or via email: an
-   HTML version is available via the bug system main contents page
+   In case you are reading this as a plain text file or via email: an HTML
+   version is available via the bug system main contents page
    http://www.debian.org/Bugs/.
-     _________________________________________________________________
+     __________________________________________________________________
 
     Debian BTS administrators <owner@bugs.debian.org>
 
    Debian bug tracking system
    Copyright © 1999 Darren O. Benham, 1997, 2003 nCipher Corporation Ltd,
    1994-1997 Ian Jackson.
-     _________________________________________________________________
+     __________________________________________________________________
 
diff --git a/includes/squeeze/common/doc/bug-mailserver-refcard.txt b/includes/squeeze/common/doc/bug-mailserver-refcard.txt
index 04a075b9c..757fb2dad 100644
--- a/includes/squeeze/common/doc/bug-mailserver-refcard.txt
+++ b/includes/squeeze/common/doc/bug-mailserver-refcard.txt
@@ -1,5 +1,3 @@
-Mail servers' reference card
-
    Full documentation of the mail servers is available on the WWW, in the
    files bug-log-mailserver.txt and bug-maint-mailcontrol.txt or by
    sending the word help to each mailserver.
@@ -70,12 +68,12 @@ Synopsis of bug submission and followup addresses
      * nnn-done
      * nnn-close
      * nnn-subscribe
-     _________________________________________________________________
+     __________________________________________________________________
 
     Debian BTS administrators <owner@bugs.debian.org>
 
    Debian bug tracking system
    Copyright © 1999 Darren O. Benham, 1997, 2003 nCipher Corporation Ltd,
    1994-1997 Ian Jackson.
-     _________________________________________________________________
+     __________________________________________________________________
 
diff --git a/includes/squeeze/common/doc/bug-maint-info.txt b/includes/squeeze/common/doc/bug-maint-info.txt
index b584c6671..332541279 100644
--- a/includes/squeeze/common/doc/bug-maint-info.txt
+++ b/includes/squeeze/common/doc/bug-maint-info.txt
@@ -1,15 +1,12 @@
-Developers' information regarding the bug processing system
-
    Initially, a bug report is submitted by a user as an ordinary mail
    message to submit@bugs.debian.org. This will then be given a number,
    acknowledged to the user, and forwarded to debian-bugs-dist. If the
    submitter included a Package line listing a package with a known
    maintainer the maintainer will get a copy too.
 
-   The Subject line will have Bug#nnn: added, and the Reply-To will be
-   set to include both the submitter of the report and
-   nnn@bugs.debian.org.
-     _________________________________________________________________
+   The Subject line will have Bug#nnn: added, and the Reply-To will be set
+   to include both the submitter of the report and nnn@bugs.debian.org.
+     __________________________________________________________________
 
      * Closing bug reports
      * Followup messages
@@ -22,20 +19,20 @@ Developers' information regarding the bug processing system
      * Subscribing to bugs
      * More-or-less obsolete subject-scanning feature
      * Obsolete X-Debian-PR: quiet feature
-     _________________________________________________________________
+     __________________________________________________________________
 
 Closing bug reports
 
-   Debian bug reports should be closed when the problem is fixed.
-   Problems in packages can only be considered fixed once a package that
-   includes the bug fix enters the Debian archive.
+   Debian bug reports should be closed when the problem is fixed. Problems
+   in packages can only be considered fixed once a package that includes
+   the bug fix enters the Debian archive.
 
    Normally, the only people that should close a bug report are the
-   submitter of the bug and the maintainer(s) of the package against
-   which the bug is filed. There are exceptions to this rule, for
-   example, the bugs filed against unknown packages or certain generic
-   pseudo-packages. When in doubt, don't close bugs, first ask for advice
-   on the debian-devel mailing list.
+   submitter of the bug and the maintainer(s) of the package against which
+   the bug is filed. There are exceptions to this rule, for example, the
+   bugs filed against unknown packages or certain generic pseudo-packages.
+   When in doubt, don't close bugs, first ask for advice on the
+   debian-devel mailing list.
 
    Bug reports should be closed by sending email to
    nnn-done@bugs.debian.org. The message body needs to contain an
@@ -52,8 +49,8 @@ Closing bug reports
 
    The person closing the bug, the person who submitted it and the
    debian-bugs-closed mailing list will each get a notification about the
-   change in status of the report. The submitter and the mailing list
-   will also receive the contents of the message sent to nnn-done.
+   change in status of the report. The submitter and the mailing list will
+   also receive the contents of the message sent to nnn-done.
 
 Followup messages
 
@@ -62,9 +59,9 @@ Followup messages
    forwarding the bug report. Please note that these are two distinct
    addresses.
 
-   If a developer wishes to reply to a bug report they should simply
-   reply to the message, respecting the Reply-To header. This will not
-   close the bug.
+   If a developer wishes to reply to a bug report they should simply reply
+   to the message, respecting the Reply-To header. This will not close the
+   bug.
 
    The bug tracking system will receive the message at
    nnn@bugs.debian.org, pass it on to the package maintainer, file the
@@ -97,8 +94,8 @@ Severity levels
    The bug system records a severity level with each bug report. This is
    set to normal by default, but can be overridden either by supplying a
    Severity line in the pseudo-header when the bug is submitted (see the
-   instructions for reporting bugs), or by using the severity command
-   with the control request server.
+   instructions for reporting bugs), or by using the severity command with
+   the control request server.
 
    The severity levels are:
 
@@ -114,9 +111,9 @@ Severity levels
 
    serious
           is a severe violation of Debian policy (roughly, it violates a
-          "must" or "required" directive), or, in the package
-          maintainer's or release manager's opinion, makes the package
-          unsuitable for release.
+          "must" or "required" directive), or, in the package maintainer's
+          or release manager's opinion, makes the package unsuitable for
+          release.
 
    important
           a bug which has a major effect on the usability of a package,
@@ -134,10 +131,10 @@ Severity levels
           difficult to fix due to major design considerations.
 
    Certain severities are considered release-critical, meaning the bug
-   will have an impact on releasing the package with the stable release
-   of Debian. Currently, these are critical, grave and serious. For
-   complete and canonical rules on what issues merit these severities,
-   see the list of Release-Critical Issues for Lenny.
+   will have an impact on releasing the package with the stable release of
+   Debian. Currently, these are critical, grave and serious. For complete
+   and canonical rules on what issues merit these severities, see the list
+   of Release-Critical Issues for Lenny.
 
 Tags for bug reports
 
@@ -146,9 +143,9 @@ Tags for bug reports
    when you look at the full bug log.
 
    Tags can be set by supplying a Tags line in the pseudo-header when the
-   bug is submitted (see the instructions for reporting bugs), or by
-   using the tags command with the control request server. Separate
-   multiple tags with commas, spaces, or both.
+   bug is submitted (see the instructions for reporting bugs), or by using
+   the tags command with the control request server. Separate multiple
+   tags with commas, spaces, or both.
 
    The current bug tags are:
 
@@ -162,15 +159,15 @@ Tags for bug reports
           This bug won't be fixed. Possibly because this is a choice
           between two arbitrary ways of doing things and the maintainer
           and submitter prefer different ways of doing things, possibly
-          because changing the behaviour will cause other, worse,
-          problems for others, or possibly for other reasons.
+          because changing the behaviour will cause other, worse, problems
+          for others, or possibly for other reasons.
 
    moreinfo
           This bug can't be addressed until more information is provided
           by the submitter. The bug will be closed if the submitter
           doesn't provide more information in a reasonable (few months)
-          timeframe. This is for bugs like "It doesn't work". What
-          doesn't work?
+          timeframe. This is for bugs like "It doesn't work". What doesn't
+          work?
 
    unreproducible
           This bug can't be reproduced on the maintainer's system.
@@ -181,8 +178,8 @@ Tags for bug reports
           The maintainer is requesting help with dealing with this bug.
 
    pending
-          A solution to this bug has been found and an upload will be
-          made soon.
+          A solution to this bug has been found and an upload will be made
+          soon.
 
    fixed
           This bug is fixed or worked around (by a non-maintainer upload,
@@ -238,8 +235,8 @@ Tags for bug reports
           This bug particularly applies to the woody distribution.
 
    sarge
-          This is a distribution tag, which has two effects. When set on
-          a bug, the bug can only affect sarge (though it may also affect
+          This is a distribution tag, which has two effects. When set on a
+          bug, the bug can only affect sarge (though it may also affect
           other distributions if other distribution tags are set) but
           otherwise normal buggy/fixed/absent rules apply. The bug also
           should not be archived until it is fixed in sarge.
@@ -251,8 +248,8 @@ Tags for bug reports
           from them.
 
    etch
-          This is a distribution tag, which has two effects. When set on
-          a bug, the bug can only affect etch (though it may also affect
+          This is a distribution tag, which has two effects. When set on a
+          bug, the bug can only affect etch (though it may also affect
           other distributions if other distribution tags are set) but
           otherwise normal buggy/fixed/absent rules apply. The bug also
           should not be archived until it is fixed in etch.
@@ -264,11 +261,11 @@ Tags for bug reports
           from them.
 
    lenny
-          This is a release tag, which has two effects. When set on a
-          bug, the bug can only affect lenny (though it may also affect
-          other releases if other release tags are set) but otherwise
-          normal buggy/fixed/absent rules apply. The bug also should not
-          be archived until it is fixed in lenny.
+          This is a release tag, which has two effects. When set on a bug,
+          the bug can only affect lenny (though it may also affect other
+          releases if other release tags are set) but otherwise normal
+          buggy/fixed/absent rules apply. The bug also should not be
+          archived until it is fixed in lenny.
 
    lenny-ignore
           This release-critical bug is to be ignored for the purposes of
@@ -277,11 +274,11 @@ Tags for bug reports
           authorization from them.
 
    squeeze
-          This is a release tag, which has two effects. When set on a
-          bug, the bug can only affect squeeze (though it may also affect
-          other releases if other release tags are set) but otherwise
-          normal buggy/fixed/absent rules apply. The bug also should not
-          be archived until it is fixed in squeeze.
+          This is a release tag, which has two effects. When set on a bug,
+          the bug can only affect squeeze (though it may also affect other
+          releases if other release tags are set) but otherwise normal
+          buggy/fixed/absent rules apply. The bug also should not be
+          archived until it is fixed in squeeze.
 
    squeeze-ignore
           This release-critical bug is to be ignored for the purposes of
@@ -290,40 +287,48 @@ Tags for bug reports
           authorization from them.
 
    sid
-          This is a release tag, which has two effects. When set on a
-          bug, the bug can only affect sid (though it may also affect
-          other releases if other release tags are set) but otherwise
-          normal buggy/fixed/absent rules apply. The bug also should not
-          be archived until it is fixed in sid.
+          This is a release tag, which has two effects. When set on a bug,
+          the bug can only affect sid (though it may also affect other
+          releases if other release tags are set) but otherwise normal
+          buggy/fixed/absent rules apply. The bug also should not be
+          archived until it is fixed in sid.
 
    experimental
-          This is a release tag, which has two effects. When set on a
-          bug, the bug can only affect experimental (though it may also
-          affect other releases if other release tags are set) but
-          otherwise normal buggy/fixed/absent rules apply. The bug also
-          should not be archived until it is fixed in experimental.
-
-   The meanings of the latter 8 tags have changed recently; the ignore
-   tags ignore the bug for the purpose of a testing propagation. The
-   release tags, which used to only indicate which bugs affected a
-   specific release, now indicate when a bug can be archived and the set
-   of releases for which a bug can be considered to be found or fixed.
+          This is a release tag, which has two effects. When set on a bug,
+          the bug can only affect experimental (though it may also affect
+          other releases if other release tags are set) but otherwise
+          normal buggy/fixed/absent rules apply. The bug also should not
+          be archived until it is fixed in experimental.
+
+   The meanings of the latter 8 distribution-specific tags have changed
+   recently; the -ignore tags ignore the bug for the purposes of testing
+   propagation. The release tags indicate that the bug in question should
+   not be archived until it is fixed in the set of releases specified. The
+   release tags also indicate that a bug should only be considered buggy
+   in the set of releases specified. [In other words, the bug is absent in
+   any release whose corresponding release tag is not set if any release
+   tags are set; otherwise the normal found/fixed rules apply.]
+
+   Release tags should not be used if proper versioning of the bug would
+   achieve the desired effect, as they require manual addition and
+   removal. If you are unsure if a release tag is required, contact the
+   Debian BTS Administrators (owner@bugs.debian.org) or the release team
+   for advice.
 
 Recording that you have passed on a bug report
 
-   When a developer forwards a bug report to the developer of the
-   upstream source package from which the Debian package is derived, they
-   should note this in the bug tracking system as follows:
+   When a developer forwards a bug report to the developer of the upstream
+   source package from which the Debian package is derived, they should
+   note this in the bug tracking system as follows:
 
    Make sure that the To field of your message to the author has only the
    author(s) address(es) in it; put the person who reported the bug,
    nnn-forwarded@bugs.debian.org and nnn@bugs.debian.org in the CC field.
 
-   Ask the author to preserve the CC to nnn-forwarded@bugs.debian.org
-   when they reply, so that the bug tracking system will file their reply
-   with the original report. These messages are only filed and are not
-   sent on; to send a message as normal, send them to nnn@bugs.debian.org
-   as well.
+   Ask the author to preserve the CC to nnn-forwarded@bugs.debian.org when
+   they reply, so that the bug tracking system will file their reply with
+   the original report. These messages are only filed and are not sent on;
+   to send a message as normal, send them to nnn@bugs.debian.org as well.
 
    When the bug tracking system gets a message at nnn-forwarded it will
    mark the relevant bug as having been forwarded to the address(es) in
@@ -342,8 +347,8 @@ Changing bug ownership
    have an owner.
 
    The owner can be set by supplying an Owner line in the pseudo-header
-   when the bug is submitted (see the instructions for reporting bugs),
-   or by using the owner and noowner commands with the control request
+   when the bug is submitted (see the instructions for reporting bugs), or
+   by using the owner and noowner commands with the control request
    server.
 
 Incorrectly listed package maintainers
@@ -361,24 +366,24 @@ Reopening, reassigning and manipulating bugs
 
    It is possible to reassign bug reports to other packages, to reopen
    erroneously-closed ones, to modify the information saying to where, if
-   anywhere, a bug report has been forwarded, to change the severities
-   and titles of reports, to set the ownership of bugs, to merge and
-   unmerge bug reports, and to record the versions of packages in which
-   bugs were found and in which they were fixed. This is done by sending
-   mail to control@bugs.debian.org.
+   anywhere, a bug report has been forwarded, to change the severities and
+   titles of reports, to set the ownership of bugs, to merge and unmerge
+   bug reports, and to record the versions of packages in which bugs were
+   found and in which they were fixed. This is done by sending mail to
+   control@bugs.debian.org.
 
-   The format of these messages is described in another document
-   available on the World Wide Web or in the file
-   bug-maint-mailcontrol.txt. A plain text version can also be obtained
-   by mailing the word help to the server at the address above.
+   The format of these messages is described in another document available
+   on the World Wide Web or in the file bug-maint-mailcontrol.txt. A plain
+   text version can also be obtained by mailing the word help to the
+   server at the address above.
 
 Subscribing to bugs
 
    The bug tracking system also allows bug submitters, developers and
    other interested third parties to subscribe to individual bugs. This
    feature can be used by those wishing to keep an eye on a bug, without
-   having to subscribe to a package through the PTS. All messages that
-   are received at nnn@bugs.debian.org, are sent to subscribers.
+   having to subscribe to a package through the PTS. All messages that are
+   received at nnn@bugs.debian.org, are sent to subscribers.
 
    Subscribing to a bug can be done by sending an email to
    nnn-subscribe@bugs.debian.org. The subject and body of the email are
@@ -389,17 +394,16 @@ Subscribing to bugs
    It is also possible to unsubscribe from a bug. Unsubscribing can be
    done by sending an email to nnn-unsubscribe@bugs.debian.org. The
    subject and body of the email are again ignored by the BTS. Users will
-   be sent a confirmation message which they must reply to if they wish
-   to be unsubscribed from the bug.
-
-   By default, the address subscribed is the one found in the From
-   header. If you wish to subscribe another address to a bug, you will
-   need to encode the address to be subscribed into the subscription
-   message. This takes the form of:
-   nnn-subscribe-localpart=example.com@bugs.debian.org. That example
-   would send localpart@example.com a subscription message for bug nnn.
-   The @ sign must be encoded by changing it to an = sign. Similarly, an
-   unsubscription takes the form
+   be sent a confirmation message which they must reply to if they wish to
+   be unsubscribed from the bug.
+
+   By default, the address subscribed is the one found in the From header.
+   If you wish to subscribe another address to a bug, you will need to
+   encode the address to be subscribed into the subscription message. This
+   takes the form of: nnn-subscribe-localpart=example.com@bugs.debian.org.
+   That example would send localpart@example.com a subscription message
+   for bug nnn. The @ sign must be encoded by changing it to an = sign.
+   Similarly, an unsubscription takes the form
    nnn-unsubscribe-localpart=example.com@bugs.debian.org. In both cases,
    the subject and body of the email will be forwarded to the email
    address within the request for confirmation.
@@ -413,13 +417,12 @@ More-or-less obsolete subject-scanning feature
    example, by using reply to all recipients).
 
    A similar scheme operates for maintonly, done, quiet and forwarded,
-   which treat mail arriving with a Subject tag as having been sent to
-   the corresponding nnn-whatever@bugs.debian.org address.
+   which treat mail arriving with a Subject tag as having been sent to the
+   corresponding nnn-whatever@bugs.debian.org address.
 
-   Messages arriving at plain forwarded and done -- ie, with no bug
-   report number in the address -- and without a bug number in the
-   Subject will be filed under "junk" and kept for a few weeks, but
-   otherwise ignored.
+   Messages arriving at plain forwarded and done -- ie, with no bug report
+   number in the address -- and without a bug number in the Subject will
+   be filed under "junk" and kept for a few weeks, but otherwise ignored.
 
 Obsolete X-Debian-PR: quiet feature
 
@@ -427,14 +430,14 @@ Obsolete X-Debian-PR: quiet feature
    forwarding anywhere messages it received at debian-bugs, by putting an
    X-Debian-PR: quiet line in the actual mail header.
 
-   This header line is now ignored. Instead, send your message to quiet
-   or nnn-quiet (or maintonly or nnn-maintonly).
-     _________________________________________________________________
+   This header line is now ignored. Instead, send your message to quiet or
+   nnn-quiet (or maintonly or nnn-maintonly).
+     __________________________________________________________________
 
     Debian BTS administrators <owner@bugs.debian.org>
 
    Debian bug tracking system
    Copyright © 1999 Darren O. Benham, 1997, 2003 nCipher Corporation Ltd,
    1994-1997 Ian Jackson.
-     _________________________________________________________________
+     __________________________________________________________________
 
diff --git a/includes/squeeze/common/doc/bug-maint-mailcontrol.txt b/includes/squeeze/common/doc/bug-maint-mailcontrol.txt
index 56ddd08c0..10fb802af 100644
--- a/includes/squeeze/common/doc/bug-maint-mailcontrol.txt
+++ b/includes/squeeze/common/doc/bug-maint-mailcontrol.txt
@@ -1,13 +1,11 @@
-Introduction to the bug control and manipulation mailserver
-
    Just as request@bugs.debian.org allows the retrieval of bug data and
    documentation by email, control@bugs.debian.org allows bug reports to
    be manipulated in various ways.
 
    The control server works just like the request server, except that it
    has some additional commands; in fact, it's the same program. The two
-   addresses are only separated to avoid users making mistakes and
-   causing problems while merely trying to request information.
+   addresses are only separated to avoid users making mistakes and causing
+   problems while merely trying to request information.
 
    Since the commands specific to the control server actually change the
    status of a bug, a notification about processing the commands is sent
@@ -26,34 +24,36 @@ Introduction to the bug control and manipulation mailserver
 
 Commands available at the control mailserver
 
-                    General     Versioning Duplicates Misc.
+    General    Versioning     Duplicates            Misc.
 
    reassign
    severity
    tag
    retitle
    submitter
+   affects
+   summary
 
-   found | notfound
-   fixed | notfixed
-   reopen
+            found | notfound
+            fixed | notfixed
+            reopen
 
-   merge | unmerge
-   forcemerge
-   clone
+                            merge | unmerge
+                            forcemerge
+                            clone
 
-   thanks
-   #
-   forwarded | notforwarded
-   owner | noowner
-   block | unblock
-   archive | unarchive
+                                           thanks
+                                           #
+                                           forwarded | notforwarded
+                                           owner | noowner
+                                           block | unblock
+                                           archive | unarchive
 
    reassign bugnumber package [ version ]
           Records that bug #bugnumber is a bug in package. This can be
-          used to set the package if the user forgot the pseudo-header,
-          or to change an earlier assignment. No notifications are sent
-          to anyone (other than the usual information in the processing
+          used to set the package if the user forgot the pseudo-header, or
+          to change an earlier assignment. No notifications are sent to
+          anyone (other than the usual information in the processing
           transcript).
 
           If you supply a version, the bug tracking system will note that
@@ -62,52 +62,55 @@ Commands available at the control mailserver
           You can assign a bug to two packages at once by separating the
           package names with a comma. However, you should only do this if
           the bug can be fixed by a change to either package. If this is
-          not the case, you should clone the bug and reassign the clone
-          to the other package.
+          not the case, you should clone the bug and reassign the clone to
+          the other package.
 
    reopen bugnumber [ originator-address | = | ! ]
           Reopens #bugnumber if it is closed.
 
-          By default, or if you specify =, the original submitter is
-          still as the originator of the report, so that they will get
-          the ack when it is closed again.
+          By default, or if you specify =, the original submitter is still
+          as the originator of the report, so that they will get the ack
+          when it is closed again.
 
           If you supply an originator-address the originator will be set
           to the address you supply. If you wish to become the new
-          originator of the reopened report you can use the ! shorthand
-          or specify your own email address.
+          originator of the reopened report you can use the ! shorthand or
+          specify your own email address.
 
           It is usually a good idea to tell the person who is about to be
           recorded as the originator that you're reopening the report, so
           that they will know to expect the ack which they'll get when it
           is closed again.
 
-          If the bug is not closed then reopen won't do anything, not
-          even change the originator. To change the originator of an open
-          bug report, use the submitter command; note that this will
-          inform the original submitter of the change.
+          If the bug is not closed then reopen won't do anything, not even
+          change the originator. To change the originator of an open bug
+          report, use the submitter command; note that this will inform
+          the original submitter of the change.
 
           If the bug was recorded as being closed in a particular version
           of a package but recurred in a later version, it is better to
           use the found command instead.
 
    found bugnumber [ version ]
-          Record that #bugnumber has been encountered in the given
-          version of the package to which it is assigned.
+          Record that #bugnumber has been encountered in the given version
+          of the package to which it is assigned. version may be a fully
+          qualified version, of the form sourcepackagename/version.
 
           The bug tracking system uses this information, in conjunction
-          with fixed versions recorded when closing bugs, to display
-          lists of bugs open in various versions of each package. It
-          considers a bug to be open when it has no fixed version, or
-          when it has been found more recently than it has been fixed.
+          with fixed versions recorded when closing bugs, to display lists
+          of bugs open in various versions of each package. It considers a
+          bug to be open when it has no fixed version, or when it has been
+          found more recently than it has been fixed.
 
           If no version is given, then the list of fixed versions for the
           bug is cleared. This is identical to the behaviour of reopen.
+          version may be a fully qualified version, of the form
+          sourcepackagename/version.
 
           This command will only cause a bug to be marked as not done if
-          no version is specified, or if the version being marked found
-          is equal to the version which was last marked fixed. (If you
-          are certain that you want the bug marked as not done, use
+          no version is specified, or if the version being marked found is
+          equal to or greater than the highest version marked fixed. (If
+          you are certain that you want the bug marked as not done, use
           reopen in conjunction with found.)
 
           This command was introduced in preference to reopen because it
@@ -116,16 +119,18 @@ Commands available at the control mailserver
 
    notfound bugnumber version
           Remove the record that #bugnumber was encountered in the given
-          version of the package to which it is assigned.
+          version of the package to which it is assigned. version may be a
+          fully qualified version, of the form sourcepackagename/version.
 
           This differs from closing the bug at that version in that the
           bug is not listed as fixed in that version either; no
-          information about that version will be known. It is intended
-          for fixing mistakes in the record of when a bug was found.
+          information about that version will be known. It is intended for
+          fixing mistakes in the record of when a bug was found.
 
    fixed bugnumber version
           Indicate that bug #bugnumber was fixed in the given version of
-          the package to which it is assigned.
+          the package to which it is assigned. version may be a fully
+          qualified version, of the form sourcepackagename/version.
 
           This does not cause the bug to be marked as closed, it merely
           adds another version in which the bug was fixed. Use the
@@ -134,11 +139,16 @@ Commands available at the control mailserver
 
    notfixed bugnumber version
           Remove the record that bug #bugnumber has been fixed in the
-          given version.
+          given version. version may be a fully qualified version, of the
+          form sourcepackagename/version.
 
           This command is equivalent to found followed by notfound (the
           found removes the fixed at a particular version, and notfound
-          removes the found.)
+          removes the found) with the exception that the bug is not
+          reopened if the found version is greater than any existing fixed
+          version. It is intended for fixing mistakes in the record of
+          when a bug was fixed; in most cases, you actually want found,
+          not notfixed.
 
    submitter bugnumber originator-address | !
           Changes the originator of #bugnumber to originator-address.
@@ -155,7 +165,14 @@ Commands available at the control mailserver
           maintainer at address. This does not actually forward the
           report. This can be used to change an existing incorrect
           forwarded-to address, or to record a new one for a bug that
-          wasn't previously noted as having been forwarded.
+          wasn't previously noted as having been forwarded. address should
+          generally be a URI, or possibly an email address. Using a URI
+          where possible allows tools to query a remote bug tracking
+          system (such as bugzilla) for a bug's status.
+
+          Example usage:
+
+      forwarded 12345 http://bugz.illa.foo/cgi/54321
 
    notforwarded bugnumber
           Forgets any idea that bugnumber has been forwarded to any
@@ -163,17 +180,14 @@ Commands available at the control mailserver
           forwarded then this will do nothing.
 
    retitle bugnumber new-title
-          Changes the title of a bug report to that specified (the
-          default is the Subject mail header from the original report).
-
-          Unlike most of the other bug-manipulation commands when used on
-          one of a set of merged reports this will change the title of
-          only the individual bug requested, and not all those with which
-          it is merged.
+          Changes the title of a bug report to that specified (the default
+          is the Subject mail header from the original report). Will also
+          change the titles of all bug reports which this bug is merged
+          with.
 
    severity bugnumber severity
-          Set the severity level for bug report #bugnumber to severity.
-          No notification is sent to the user who reported the bug.
+          Set the severity level for bug report #bugnumber to severity. No
+          notification is sent to the user who reported the bug.
 
           Severities are critical, grave, serious, important, normal,
           minor, and wishlist.
@@ -181,6 +195,27 @@ Commands available at the control mailserver
           For their meanings please consult the general developers'
           documentation for the bug system.
 
+   affects bugnumber [ + | - | = ] package [ package ... ]
+          Indicates that a bug affects another package. In the case where
+          bugnumber causes breakage in package even though the bug is
+          actually present in the package to which it is assigned, this
+          causes the bug to be listed by default in the package list of
+          package. This should generally be used where the bug is severe
+          enough to cause multiple reports from users to be assigned to
+          the wrong package.
+
+   summary bugnumber [message number]
+          Selects a message to use as a summary of a bug. The first
+          non-pseudoheader paragraph of that message is parsed and set as
+          the summary of the bug which is displayed on the top of the bug
+          report page. This is useful in cases where the original report
+          doesn't correctly describe the problem or the bug has many
+          messages which make it difficult to identify the actual problem.
+
+          If message number is not given, clears the summary. message
+          number is the message number as listed in the bugreport cgi
+          script output.
+
    clone bugnumber NewID [ new IDs ... ]
           The clone control command allows you to duplicate a bug report.
           It is useful in the case where a single report actually
@@ -203,21 +238,21 @@ Commands available at the control mailserver
           merge -1 -3
 
    merge bugnumber bugnumber ...
-          Merges two or more bug reports. When reports are merged
-          opening, closing, marking or unmarking as forwarded and
-          reassigning any of the bugs to a new package will have an
-          identical effect on all of the merged reports.
+          Merges two or more bug reports. When reports are merged opening,
+          closing, marking or unmarking as forwarded and reassigning any
+          of the bugs to a new package will have an identical effect on
+          all of the merged reports.
 
           Before bugs can be merged they must be in exactly the same
-          state: either all open or all closed, with the same
-          forwarded-to upstream author address or all not marked as
-          forwarded, all assigned to the same package or package(s) (an
-          exact string comparison is done on the package to which the bug
-          is assigned), and all of the same severity. If they don't start
-          out in the same state you should use reassign, reopen and so
-          forth to make sure that they are before using merge. Titles are
-          not required to match, and will not be affected by the merge.
-          Tags are not required to match, either, they will be joined.
+          state: either all open or all closed, with the same forwarded-to
+          upstream author address or all not marked as forwarded, all
+          assigned to the same package or package(s) (an exact string
+          comparison is done on the package to which the bug is assigned),
+          and all of the same severity. If they don't start out in the
+          same state you should use reassign, reopen and so forth to make
+          sure that they are before using merge. Titles are not required
+          to match, and will not be affected by the merge. Tags are not
+          required to match, either, they will be joined.
 
           If any of the bugs listed in a merge command is already merged
           with another bug then all the reports merged with any of the
@@ -227,17 +262,15 @@ Commands available at the control mailserver
           Merging reports causes a note to appear on each report's logs;
           on the WWW pages this is includes links to the other bugs.
 
-          Merged reports are all expired simultaneously, and only when
-          all of the reports each separately meet the criteria for
-          expiry.
+          Merged reports are all expired simultaneously, and only when all
+          of the reports each separately meet the criteria for expiry.
 
    forcemerge bugnumber bugnumber ...
-          Forcibly merges two or more bug reports. The first bug listed
-          is the master bug, and its settings (the settings which must be
-          equal in a normal merge) are assigned to the bugs listed next.
-          To avoid typos erroneously merging bugs, bugs must be in the
-          same package. See the text above for a description of what
-          merging means.
+          Forcibly merges two or more bug reports. The settings of the
+          first bug listed which must be equal in a normal merge are
+          assigned to the bugs listed next. To avoid typos erroneously
+          merging bugs, bugs must be in the same package. See the text
+          above for a description of what merging means.
 
           Note that this makes it possible to close bugs by merging; you
           are responsible for notifying submitters with an appropriate
@@ -259,12 +292,13 @@ Commands available at the control mailserver
           you want to disconnect more than one bug simply include several
           unmerge commands in your message.
 
-   tags bugnumber [ + | - | = ] tag [ tag ... ]
-          Sets tags for the bug report #bugnumber. No notification is
-          sent to the user who reported the bug. Setting the action to +
-          means to add each given tag, - means to remove each given tag,
-          and = means to ignore the current tags and set them afresh to
-          the list provided. The default action is adding.
+   tags bugnumber [ + | - | = ] tag [ tag ... ] [ + | - | = tag ... ] ]
+          Sets tags for the bug report #bugnumber. No notification is sent
+          to the user who reported the bug. Setting the action to + means
+          to add each tag following, - means to remove each tag following,
+          and = means to set the following tags to the list provided.
+          Intervening +, -, or = change the action for the tags following.
+          The default action is adding.
 
           Example usage:
 
@@ -283,6 +317,9 @@ Commands available at the control mailserver
           # set tags to exactly 'moreinfo' and 'unreproducible'
           tags 123456 = moreinfo unreproducible
 
+          # remove the moreinfo tag and add a patch tag
+          tags 123456 - moreinfo + patch
+
           Available tags currently include patch, wontfix, moreinfo,
           unreproducible, help, pending, fixed, fixed-in-experimental,
           fixed-upstream, security, upstream, confirmed, d-i, ipv6, lfs,
@@ -304,24 +341,24 @@ Commands available at the control mailserver
    close bugnumber [ fixed-version ] (deprecated)
           Close bug report #bugnumber.
 
-          A notification is sent to the user who reported the bug, but
-          (in contrast to mailing bugnumber-done@bugs.debian.org) the
-          text of the mail which caused the bug to be closed is not
-          included in that notification. The maintainer who closes a
-          report needs to ensure, probably by sending a separate message,
-          that the user who reported the bug knows why it is being
-          closed. The use of this command is therefore deprecated. See
-          the developer's information about how to close a bug properly.
+          A notification is sent to the user who reported the bug, but (in
+          contrast to mailing bugnumber-done@bugs.debian.org) the text of
+          the mail which caused the bug to be closed is not included in
+          that notification. The maintainer who closes a report needs to
+          ensure, probably by sending a separate message, that the user
+          who reported the bug knows why it is being closed. The use of
+          this command is therefore deprecated. See the developer's
+          information about how to close a bug properly.
 
-          If you supply a fixed-version, the bug tracking system will
-          note that the bug was fixed in that version of the package.
+          If you supply a fixed-version, the bug tracking system will note
+          that the bug was fixed in that version of the package.
 
    package [ packagename ... ]
           Limits the following commands so that they will only apply to
-          bugs filed against the listed packages. You can list one or
-          more packages. If you don't list any packages, the following
-          commands will apply to all bugs. You're encouraged to use this
-          as a safety feature in case you accidentally use the wrong bug
+          bugs filed against the listed packages. You can list one or more
+          packages. If you don't list any packages, the following commands
+          will apply to all bugs. You're encouraged to use this as a
+          safety feature in case you accidentally use the wrong bug
           numbers.
 
           Example usage:
@@ -337,13 +374,12 @@ Commands available at the control mailserver
           severity 234567 wishlist
 
    owner bugnumber address | !
-          Sets address to be the "owner" of #bugnumber. The owner of a
-          bug claims responsibility for fixing it. This is useful to
-          share out work in cases where a package has a team of
-          maintainers.
+          Sets address to be the "owner" of #bugnumber. The owner of a bug
+          claims responsibility for fixing it. This is useful to share out
+          work in cases where a package has a team of maintainers.
 
-          If you wish to become the owner of the bug yourself, you can
-          use the ! shorthand or specify your own email address.
+          If you wish to become the owner of the bug yourself, you can use
+          the ! shorthand or specify your own email address.
 
    noowner bugnumber
           Forgets any idea that the bug has an owner other than the usual
@@ -356,17 +392,20 @@ Commands available at the control mailserver
           requirements for archival, ignoring time.
 
    unarchive bugnumber
-          Unarchives a bug that was previously archived. Unarchival
-          should generally be coupled with reopen and found/fixed as
-          appropriate. Bugs that have been unarchived can be archived
-          using archive assuming the non-time based archival requirements
-          are met.
+          Unarchives a bug that was previously archived. Unarchival should
+          generally be coupled with reopen and found/fixed as appropriate.
+          Bugs that have been unarchived can be archived using archive
+          assuming the non-time based archival requirements are met. You
+          should not be using unarchive to make trivial changes to
+          archived bugs, such as changing the submitter; its primary
+          purpose is to allow for the reopening of bugs which have been
+          archived without the intervention of BTS administrators.
 
    #...
           One-line comment. The # must be at the start of the line. The
-          text of comments will be included in the acknowledgement sent
-          to the sender and to affected maintainers, so you can use this
-          to document the reasons for your commands.
+          text of comments will be included in the acknowledgement sent to
+          the sender and to affected maintainers, so you can use this to
+          document the reasons for your commands.
 
    quit
    stop
@@ -380,12 +419,12 @@ Commands available at the control mailserver
           message; the remainder of the message can include explanations,
           signatures or anything else, none of it will be detected by the
           control server.
-     _________________________________________________________________
+     __________________________________________________________________
 
     Debian BTS administrators <owner@bugs.debian.org>
 
    Debian bug tracking system
    Copyright © 1999 Darren O. Benham, 1997, 2003 nCipher Corporation Ltd,
    1994-1997 Ian Jackson.
-     _________________________________________________________________
+     __________________________________________________________________
 
diff --git a/includes/squeeze/common/doc/bug-reporting.txt b/includes/squeeze/common/doc/bug-reporting.txt
index 974eb2085..675a4d9cb 100644
--- a/includes/squeeze/common/doc/bug-reporting.txt
+++ b/includes/squeeze/common/doc/bug-reporting.txt
@@ -1,9 +1,8 @@
-How to report a bug in Debian using reportbug
-
    We strongly recommend that you report bugs in Debian using the
    reportbug program. To install and start it, simply run:
 
-     aptitude install reportbug; reportbug
+     # aptitude install reportbug
+     $ reportbug
 
    It will guide you through the bug reporting process step by step.
 
@@ -27,8 +26,8 @@ What package does your bug report belong to?
    asking for advice.
 
    If your problem doesn't relate just to one package but some general
-   Debian service, there are several pseudo-packages or even mailing
-   lists that you can use to relay your message to us instead.
+   Debian service, there are several pseudo-packages or even mailing lists
+   that you can use to relay your message to us instead.
 
 Has your bug report been filed already?
 
@@ -46,24 +45,22 @@ Send multiple reports for multiple bugs
 
 Don't file bugs upstream
 
-   If you file a bug in Debian, don't send a copy to the upstream
-   software maintainers yourself, as it is possible that the bug exists
-   only in Debian. If necessary, the maintainer of the package will
-   forward the bug upstream.
+   If you file a bug in Debian, don't send a copy to the upstream software
+   maintainers yourself, as it is possible that the bug exists only in
+   Debian. If necessary, the maintainer of the package will forward the
+   bug upstream.
 
 Sending the bug report via e-mail
 
    You can report bugs in Debian by sending an e-mail to
-   submit@bugs.debian.org with a special format described below.
-   reportbug (see above) will properly format the e-mails for you; please
-   use it!
+   submit@bugs.debian.org with a special format described below. reportbug
+   (see above) will properly format the e-mails for you; please use it!
 
 Headers
 
-   Like any e-mail you should include a clear, descriptive Subject line
-   in your main mail header. The subject you give will be used as the
-   initial bug title in the tracking system, so please try to make it
-   informative!
+   Like any e-mail you should include a clear, descriptive Subject line in
+   your main mail header. The subject you give will be used as the initial
+   bug title in the tracking system, so please try to make it informative!
 
    If you'd like to send a copy of your bug report to additional
    recipients (such as mailing lists), you shouldn't use the usual e-mail
@@ -87,10 +84,10 @@ Version: <packageversion>
    tracking system relies on this field to work out which releases are
    affected by the bug.
 
-   You need to supply a correct Package line in the pseudo-header in
-   order for the bug tracking system to deliver the message to the
-   package's maintainer. See this example for information on how to find
-   this information.
+   You need to supply a correct Package line in the pseudo-header in order
+   for the bug tracking system to deliver the message to the package's
+   maintainer. See this example for information on how to find this
+   information.
 
    For other valid pseudo-headers, see Additional pseudo-headers
 
@@ -118,16 +115,15 @@ The body of the report
        hardware in your system, as problems are often caused by IRQ and
        I/O address conflicts.
      * If you have reportbug installed the output of reportbug -q
-       --template -T none -s none -S normal -b --list-cc none -q
-       <package> will also be useful, as it contains the output of
-       maintainer specific scripts and version information.
+       --template -T none -s none -S normal -b --list-cc none -q <package>
+       will also be useful, as it contains the output of maintainer
+       specific scripts and version information.
 
-   Include any detail that seems relevant -- you are in very little
-   danger of making your report too long by including too much
-   information. If they are small, please include in your report any
-   files you were using to reproduce the problem. (If they are large,
-   consider making them available on a publicly available website if
-   possible.)
+   Include any detail that seems relevant -- you are in very little danger
+   of making your report too long by including too much information. If
+   they are small, please include in your report any files you were using
+   to reproduce the problem. (If they are large, consider making them
+   available on a publicly available website if possible.)
 
    For more advice on how to help the developers solve your problem,
    please read How to Report Bugs Effectively.
@@ -165,10 +161,10 @@ Sending copies of bug reports to other addresses
 
    You could do this by CC'ing your bug report to the other address(es),
    but then the other copies would not have the bug report number put in
-   the Reply-To field and the Subject line. When the recipients reply
-   they will probably preserve the submit@bugs.debian.org entry in the
-   header and have their message filed as a new bug report. This leads to
-   many duplicated reports.
+   the Reply-To field and the Subject line. When the recipients reply they
+   will probably preserve the submit@bugs.debian.org entry in the header
+   and have their message filed as a new bug report. This leads to many
+   duplicated reports.
 
    The right way to do this is to use the X-Debbugs-CC header. Add a line
    like this to your message's mail header:
@@ -193,9 +189,9 @@ Severity levels
 
    If a report is of a particularly serious bug, or is merely a feature
    request, you can set the severity level of the bug as you report it.
-   This is not required however, and the package maintainer will assign
-   an appropriate severity level to your report even if you do not (or
-   pick the wrong severity).
+   This is not required however, and the package maintainer will assign an
+   appropriate severity level to your report even if you do not (or pick
+   the wrong severity).
 
    To assign a severity level, put a line like this one in the
    pseudo-header:
@@ -215,8 +211,8 @@ Assigning tags
 Tags: <tags>
 
    Replace <tags> with one or more of the available tags, as described in
-   the advanced documentation. Separate multiple tags with commas,
-   spaces, or both.
+   the advanced documentation. Separate multiple tags with commas, spaces,
+   or both.
 User: <username>
 Usertags: <usertags>
 
@@ -240,8 +236,8 @@ Source: foopackage
    foopackage; for most bugs in most packages you don't want to use this
    option.
 
-   Finally, if your MUA doesn't allow you to edit the headers, you can
-   set the various X-Debbugs- headers in the pseudo-headers.
+   Finally, if your MUA doesn't allow you to edit the headers, you can set
+   the various X-Debbugs- headers in the pseudo-headers.
 
 Additional information
 
@@ -249,9 +245,9 @@ Different submission addresses (minor or mass bug reports)
 
    If a bug report is minor, for example, a documentation typo or a
    trivial build problem, please adjust the severity appropriately and
-   send it to maintonly@bugs.debian.org instead of
-   submit@bugs.debian.org. maintonly will forward the report to the
-   package maintainer only, it won't forward it to the BTS mailing lists.
+   send it to maintonly@bugs.debian.org instead of submit@bugs.debian.org.
+   maintonly will forward the report to the package maintainer only, it
+   won't forward it to the BTS mailing lists.
 
    If you're submitting many reports at once, you should definitely use
    maintonly@bugs.debian.org so that you don't cause too much redundant
@@ -259,49 +255,60 @@ Different submission addresses (minor or mass bug reports)
    you may also want to post a summary on debian-bugs-dist.
 
    If wish to report a bug to the bug tracking system that's already been
-   sent to the maintainer, you can use quiet@bugs.debian.org. Bugs sent
-   to quiet@bugs.debian.org will not be forwarded anywhere, only filed.
+   sent to the maintainer, you can use quiet@bugs.debian.org. Bugs sent to
+   quiet@bugs.debian.org will not be forwarded anywhere, only filed.
 
    When you use different submission addresses, the bug tracking system
-   will set the Reply-To of any forwarded message so that the replies
-   will by default be processed in the same way as the original report.
-   That means that, for example, replies to maintonly will go to
-   nnn-maintonly@bugs.debian.org instead of nnn@bugs.debian.org, unless
-   of course one overrides this manually.
+   will set the Reply-To of any forwarded message so that the replies will
+   by default be processed in the same way as the original report. That
+   means that, for example, replies to maintonly will go to
+   nnn-maintonly@bugs.debian.org instead of nnn@bugs.debian.org, unless of
+   course one overrides this manually.
 
 Acknowledgements
 
-   Normally, the bug tracking system will return an acknowledgement to
-   you by e-mail when you report a new bug or submit additional
-   information to an existing bug. If you want to suppress this
-   acknowledgement, include an X-Debbugs-No-Ack header in your e-mail
-   (the contents of this header do not matter; however, it must be in the
-   mail header and not in the pseudo-header with the Package field). If
-   you report a new bug with this header, you will need to check the web
-   interface yourself to find the bug number.
+   Normally, the bug tracking system will return an acknowledgement to you
+   by e-mail when you report a new bug or submit additional information to
+   an existing bug. If you want to suppress this acknowledgement, include
+   an X-Debbugs-No-Ack header or pseudoheader in your e-mail (the contents
+   of this header do not matter). If you report a new bug with this
+   header, you will need to check the web interface yourself to find the
+   bug number.
 
    Note that this header will not suppress acknowledgements from the
    control@bugs.debian.org mailserver, since those acknowledgements may
    contain error messages which should be read and acted upon.
 
+Spamfighting and missing mail
+
+   The bug tracking system implements a rather extensive set of rules
+   designed to make sure that spam does not make it through the BTS. While
+   we try to minimize the number of false positives, they do occur. If you
+   suspect your mail has triggered a false positive, feel free to contact
+   owner@bugs.debian.org for assistance. Another common cause of mail not
+   making it through to the BTS is utilizing addresses which match
+   procmail's FROM_DAEMON, which includes mail from addresses like
+   mail@foobar.com. If you suspect your mail matches FROM_DAEMON, see
+   procmailrc(5) to verify, and then resend the mail using an address
+   which does not match FROM_DAEMON.
+
 Bug reports against unknown packages
 
    If the bug tracking system doesn't know who the maintainer of the
-   relevant package is it will forward the report to debian-bugs-dist
-   even if maintonly was used.
+   relevant package is it will forward the report to debian-bugs-dist even
+   if maintonly was used.
 
    When sending to maintonly@bugs.debian.org or
    nnn-maintonly@bugs.debian.org you should make sure that the bug report
    is assigned to the right package, by putting a correct Package at the
    top of an original submission of a report, or by using the
-   control@bugs.debian.org service to (re)assign the report
-   appropriately.
+   control@bugs.debian.org service to (re)assign the report appropriately.
 
 Using dpkg to find the package and version for the report
 
    When using reportbug to report a bug in a command, say grep, the
-   following will automatically select the right package and let you
-   write the report right away: reportbug --file $(which grep)
+   following will automatically select the right package and let you write
+   the report right away: reportbug --file $(which grep)
 
    You can also find out which package installed it by using dpkg
    --search. You can find out which version of a package you have
@@ -349,14 +356,14 @@ Other useful commands and packages
    provides a convenient text-based interface to the bug tracking system.
 
    Emacs users can also use the debian-bug command provided by the
-   debian-el package. When called with M-x debian-bug, it will ask for
-   all necessary information in a similar way to reportbug.
-     _________________________________________________________________
+   debian-el package. When called with M-x debian-bug, it will ask for all
+   necessary information in a similar way to reportbug.
+     __________________________________________________________________
 
     Debian BTS administrators <owner@bugs.debian.org>
 
    Debian bug tracking system
    Copyright © 1999 Darren O. Benham, 1997, 2003 nCipher Corporation Ltd,
    1994-1997 Ian Jackson.
-     _________________________________________________________________
+     __________________________________________________________________
 
diff --git a/includes/squeeze/common/doc/mailing-lists.txt b/includes/squeeze/common/doc/mailing-lists.txt
index c72295b1b..93e8dff74 100644
--- a/includes/squeeze/common/doc/mailing-lists.txt
+++ b/includes/squeeze/common/doc/mailing-lists.txt
@@ -56,271 +56,405 @@ User lists
 
   debian-announce@lists.debian.org
 
-      Description : Important announcements
+      Description : Major news and very important changes in the project
+                    are announced here.
       Moderated   : yes
       Subscription: open
 
+  debian-backports-announce@lists.debian.org
+
+      Description : Announcements relating to the debian-backports project include security related announcements
+      Moderated   : yes
+      Subscription: open
+
+  debian-backports@lists.debian.org
+
+      Description : Discussion about the debian-backports archive
+      Moderated   : no
+      Subscription: open
+
   debian-chinese-big5@lists.debian.org
 
-      Description : debian-user in Chinese [Big5]
+      Description : Debian Chinese Project: Chinese localization (l10n),
+                    documentation and web site translation, user support
+                    etc.
+
+                    Posts may be in English or Big5-encoded Chinese.
+                    All posts are automatically converted to GB encoding
+                    and cross-posted to the debian-chinese-gb mailing list.
+
+                    If you would rather read and post in GB-encoded
+                    Chinese, please subscribe to debian-chinese-gb instead.
       Language    : Chinese
       Moderated   : subscribers
       Subscription: open
 
   debian-chinese-gb@lists.debian.org
 
-      Description : debian-user in Chinese [GB]
+      Description : Debian Chinese Project: Chinese localization (l10n)
+                    issues, documentation and web site translation, user
+                    support etc.
+
+                    Posts may be in English or GB-encoded Chinese.
+                    All posts are automatically converted to Big5 encoding
+                    and cross-posted to the debian-chinese-big5 mailing list.
+
+                    If you would rather read and post in Big5-encoded
+                    Chinese, please subscribe to debian-chinese-big5 instead.
       Language    : Chinese
       Moderated   : subscribers
       Subscription: open
 
   debian-edu-announce@lists.debian.org
 
-      Description : Announcements for the debian-edu archive
+      Description : Announcements regarding Skolelinux/debian-edu
       Moderated   : yes
       Subscription: open
 
   debian-enterprise@lists.debian.org
 
-      Description : Debian for the enterprise
+      Description : Discussions about special needs in enterprise 
+                    environments and ways to fulfill those needs.
       Moderated   : no
       Subscription: open
 
   debian-esperanto@lists.debian.org
 
-      Description : debian-user in Esperanto
+      Description : Debian users who speak Esperanto.
       Language    : Esperanto
       Moderated   : no
       Subscription: open
 
   debian-firewall@lists.debian.org
 
-      Description : Running a firewall on Debian
+      Description : Discussion of implementation and maintenance of
+                    firewalls using Debian. Both basic issues and new
+                    more exotic developments are discussed here.
       Moderated   : no
       Subscription: open
 
   debian-infrastructure-announce@lists.debian.org
 
-      Description : Infrastructure announcements
+      Description : This list covers announcements about changes in the (public and
+                    private) Debian infrastructure including services the Debian
+                    project directly or indirectly provides.  
       Moderated   : signed
       Subscription: open
 
   debian-isp@lists.debian.org
 
-      Description : Debian at Internet Service Providers
+      Description : Discussion about issues and problems specific to
+                    Internet Service Providers (ISPs for short) that
+                    use Debian.
       Moderated   : no
       Subscription: open
 
   debian-italian@lists.debian.org
 
-      Description : debian-user in Italian
+      Description : Support for Debian users that speak Italian.
+                    (High-volume mailing list.)
       Language    : Italian
       Moderated   : no
       Subscription: open
 
   debian-japanese@lists.debian.org
 
-      Description : debian-user in Japanese
+      Description : Support for Debian users that speak Japanese,
+                    Japanese localization issues, integrating
+                    Debian JP packages into Debian etc.
+
+                    The English language is allowed, but using Japanese is
+                    encouraged even for those who aren't native speakers.
+
+                    For native Japanese, Debian JP Project provides
+                    several mailing lists discussing the Debian system in
+                    Japanese, see http://www.debian.or.jp/MailingList.html
       Language    : English/Japanese
       Moderated   : no
       Subscription: open
 
   debian-kde@lists.debian.org
 
-      Description : KDE in Debian
+      Description : Discussions related to KDE in Debian.
+                    Those developing KDE-based packages are
+                    encouraged to use this to discuss issues
+                    and share their experience.
       Moderated   : no
       Subscription: open
 
   debian-laptop@lists.debian.org
 
-      Description : Debian on mobile computers
+      Description : Installing, updating and using laptops with Debian.
+                    Suggestions on special packaging, complaints, etc.
+                    are welcome.
       Moderated   : no
       Subscription: open
 
   debian-news-french@lists.debian.org
 
-      Description : French Debian News, weekly and otherwise
+      Description : News about Debian for users speaking French.
       Language    : French
       Moderated   : yes
       Subscription: open
 
   debian-news-german@lists.debian.org
 
-      Description : German Debian News, weekly and otherwise
+      Description : News about Debian for users speaking German.
       Language    : German
       Moderated   : yes
       Subscription: open
 
   debian-news-italian@lists.debian.org
 
-      Description : Italian Debian News, weekly and otherwise
+      Description : Releases, news, internationalization efforts and
+                    other related news about Debian for Italian-speaking users.
       Language    : Italian
       Moderated   : yes
       Subscription: open
 
   debian-news-portuguese@lists.debian.org
 
-      Description : Portuguese Debian News, weekly and otherwise
+      Description : Releases, news, internationalization efforts and other
+                    related news about Debian for users speaking Portuguese.
       Language    : Portuguese
       Moderated   : yes
       Subscription: open
 
   debian-news-spanish@lists.debian.org
 
-      Description : Spanish Debian News, weekly and otherwise
+      Description : Releases, news, internationalization efforts and
+                    other related news about Debian for Spanish-speaking users.
       Language    : Spanish
       Moderated   : yes
       Subscription: open
 
   debian-news@lists.debian.org
 
-      Description : Debian News, weekly and otherwise
+      Description : General news about the distribution and the project.
+
+                    The current events and news about Debian are
+                    summarized in the Debian Weekly News, a newsletter
+                    regularly posted on this list.
       Moderated   : yes
       Subscription: open
 
   debian-photo@lists.debian.org
 
-      Description : Using Debian for photography
+      Description : Using software in Debian for photography, and discussion about problems,
+                    challenges and opportunities related to that. All parts of the
+                    photographic process are on topic: controlling the camera, transferring
+                    pictures to the computer, managing, editing, converting, printing,
+                    uploading, displaying, etc.
+                    .        
+                    For bandwidth and disk space reasons, it is not, however, appropriate
+                    to send images to the list. Put them on a web site and include the URL
+                    in a mail sent to the list instead.
+      Moderated   : no
+      Subscription: open
+
+  debian-research@lists.debian.org
+
+      Description : This list's goal is to gather those interested in Debian from an
+                    academic perspective. 
       Moderated   : no
       Subscription: open
 
   debian-russian@lists.debian.org
 
-      Description : debian-user in Russian
+      Description : Support for Debian users that speak Russian, 
+                    and Russian localization issues: translating
+                    "po" files, coordinating patches for Debian
+                    packages to work with the Russian language.
       Language    : Russian
       Moderated   : no
       Subscription: open
 
   debian-security-announce@lists.debian.org
 
-      Description : Security announcements
+      Description : The security team informs the users about security
+                    problems by posting security advisories about
+                    Debian packages on this list.
       Moderated   : yes
       Subscription: open
 
   debian-security@lists.debian.org
 
-      Description : Security in Debian
+      Description : Discussion about security issues, including
+                    cryptographic issues, that are of interest to
+                    all parts of the Debian community.
+
+                    Please note that this is NOT an announcement
+                    mailing list. If you're looking for security
+                    advisories from Debian, subscribe to
+                    debian-security-announce instead.
       Moderated   : no
       Subscription: open
 
+  debian-stable-announce@lists.debian.org
+
+      Description : Updates to stable packages will be announced on this list.
+      Moderated   : yes
+      Subscription: open
+
   debian-testing-security-announce@lists.debian.org
 
-      Description : Security announcements for testing
+      Description : The testing-security team informs users about security problems by 
+                    posting summaries about fixed packages in Debian testing on this list.
       Moderated   : yes
       Subscription: open
 
   debian-user-catalan@lists.debian.org
 
-      Description : debian-user in Catalan
+      Description : Support for Debian users that speak Catalan.
       Language    : Catalan
       Moderated   : no
       Subscription: open
 
   debian-user-danish@lists.debian.org
 
-      Description : debian-user in Danish
+      Description : Support for Debian users who speak Danish.
       Language    : Danish
       Moderated   : no
       Subscription: open
 
+  debian-user-dutch@lists.debian.org
+
+      Description : Support for Debian users that speak Dutch
+      Language    : Dutch
+      Moderated   : no
+      Subscription: open
+
+  debian-user-finnish@lists.debian.org
+
+      Description : Support for Debian users who speak Finnish.
+      Language    : Finnish
+      Moderated   : no
+      Subscription: open
+
   debian-user-french@lists.debian.org
 
-      Description : debian-user in French
+      Description : Support for Debian users that speak French.
+                    (High-volume mailing list.)
       Language    : French
       Moderated   : no
       Subscription: open
 
   debian-user-german@lists.debian.org
 
-      Description : debian-user in German
+      Description : Support for Debian users that speak German.
+                    (High-volume mailing list.)
       Language    : German
       Moderated   : no
       Subscription: open
 
+  debian-user-greek@lists.debian.org
+
+      Description : Support for Debian users that speak Greek.
+      Moderated   : no
+      Subscription: open
+
   debian-user-hungarian
 
-      Description : debian-user in Hungarian
+      Description : Support for Debian users that speak Hungarian.
       Language    : Hungarian
       Subscription: http://lists.linux.hu/mailman/listinfo/debian
 
   debian-user-icelandic@lists.debian.org
 
-      Description : debian-user in Icelandic
+      Description : Support for Debian users that speak Icelandic.
       Moderated   : no
       Subscription: open
 
   debian-user-indonesian@lists.debian.org
 
-      Description : debian-user in Indonesian
+      Description : Support for Debian users who speak Indonesian.
       Language    : Indonesian
       Moderated   : no
       Subscription: open
 
   debian-user-polish@lists.debian.org
 
-      Description : debian-user in Polish
+      Description : Support for Debian users that speak Polish.
       Language    : Polish
       Moderated   : no
       Subscription: open
 
   debian-user-portuguese@lists.debian.org
 
-      Description : debian-user in Portuguese
+      Description : Support for Debian users who speak Portuguese.
+                    (High-volume mailing list.)
       Language    : Portuguese (both European and Brazilian, and other dialects are welcome)
       Moderated   : no
       Subscription: open
 
+  debian-user-slovenian@lists.debian.org
+
+      Description : Support for Debian users that speak Slovenian.
+      Language    : Slovenian
+      Moderated   : no
+      Subscription: open
+
   debian-user-spanish@lists.debian.org
 
-      Description : debian-user in Spanish
+      Description : Support for Debian users that speak Spanish.
+                    (High-volume mailing list.)
       Language    : Spanish
       Moderated   : no
       Subscription: open
 
   debian-user-swedish@lists.debian.org
 
-      Description : debian-user in Swedish
+      Description : Support for Debian users that speak Swedish.
       Language    : Swedish
       Moderated   : no
       Subscription: open
 
+  debian-user-tamil@lists.debian.org
+
+      Description : Mailing list to discuss Tamil localisation efforts for Debian and to coordinate 
+                    Tamil localisation activities. You can also get Debian support in Tamil here.
+      Language    : Tamil
+      Moderated   : no
+      Subscription: open
+
   debian-user-turkish@lists.debian.org
 
-      Description : debian-user in Turkish
+      Description : Support for Debian users that speak Turkish.
       Language    : Turkish
       Moderated   : no
       Subscription: open
 
   debian-user-ukrainian@lists.debian.org
 
-      Description : debian-user in Ukrainian
+      Description : Support for Debian users who speak Ukrainian.
       Language    : Ukrainian
       Moderated   : no
       Subscription: open
 
   debian-user-vietnamese@lists.debian.org
 
-      Description : debian-user in Vietnamese
+      Description : Support for Debian users that speak Vietnamese, and discussions on translations
       Language    : Vietnamese
       Moderated   : no
       Subscription: open
 
   debian-user@lists.debian.org
 
-      Description : Help and discussion among users of Debian
+      Description : Support for Debian users who speak English.
+                    (High-volume mailing list.)
       Digest      : debian-user-digest@lists.debian.org
       Moderated   : no
       Subscription: open
 
   debian-volatile-announce@lists.debian.org
 
-      Description : Announcements for the debian-volatile archive
+      Description : Announcements relating to the debian-volatile project include new uploads and changes
       Moderated   : yes
       Subscription: open
 
   debian-volatile@lists.debian.org
 
-      Description : Using the debian-volatile archive
+      Description : Discussion about the debian-volatile archive
       Moderated   : no
       Subscription: open
 
@@ -333,450 +467,652 @@ Development lists
 
   debian-accessibility@lists.debian.org
 
-      Description : Making Debian more accessible to people with disabilities
+      Description : User and Developer list for accessibility-related issues.
+      Moderated   : no
+      Subscription: open
+
+  debian-ada@lists.debian.org
+
+      Description : Discussion of Ada in Debian.
+
+                    This list is intended for:
+                    - discussion of the Debian Policy for Ada
+                    - release coordination among Ada packages in Debian
+                    - packaging advice
+                    - general help for Ada programmers using the Debian packages
+
+                    You can find the Debian Policy for Ada at 
+                    http://people.debian.org/~lbrenta/debian-ada-policy.html
       Moderated   : no
       Subscription: open
 
   debian-apache@lists.debian.org
 
-      Description : Maintaining the Debian Apache (web server) and related packages
+      Description : Maintenance of the Apache HTTP server and related
+                    packages in Debian: code changes, reproducing bugs,
+                    talking to upstream etc.
+
+                    It is neither for submitting bug reports (please
+                    use the BTS for that), nor for support requests.
       Moderated   : no
       Subscription: open
 
   debian-beowulf@lists.debian.org
 
-      Description : Debian on Beowulf clusters
+      Description : Discussion about Beowulf systems running Debian.
+      Moderated   : no
+      Subscription: open
+
+  debian-blends@lists.debian.org
+
+      Description : Debian Pure Blends (formerly known as Custom Debian Distributions)
+                    provide support for special user interests. They implement a new
+                    approach to cover interests of specialised users, who might be 
+                    children, lawyers, medical staff, visually impaired people, etc.
+                    Of late, several Debian Pure Blends have evolved. The common goal 
+                    of those is to make installation and administration of computers 
+                    for their target users as easy as possible, and to serve in the
+                    role as the missing link between software developers and users
+                    well.
+                    
+                    You can get more information at
+                    http://blends.alioth.debian.org/blends/
       Moderated   : no
       Subscription: open
 
   debian-boot@lists.debian.org
 
-      Description : Developing the installation system
+      Description : Discussion and maintenance of the Debian
+                    installation system.
       Moderated   : no
       Subscription: open
 
   debian-cd@lists.debian.org
 
-      Description : Creating Debian CD Images
+      Description : Creating Debian CD sets, official and unofficial.
+      Moderated   : no
+      Subscription: open
+
+  debian-cli@lists.debian.org
+
+      Description : This list is about using and/or developing for the Common Language
+                    Infrastructure (CLI).
+                    If you want to develop software or create Debian packages
+                    that uses Mono, GNU Portable.NET or LLVM VMKit then you are right on this
+                    mailing list.
+                    If you are writing software in C#, VB.NET, Boo, Nemerle or other
+                    CLI based/enabled programming languages then you are also welcome on this list.
       Moderated   : no
       Subscription: open
 
   debian-ctte-private@lists.debian.org
 
-      Description : Debian Technical Committee private list [dead list]
+      Description : Private communication between tech committee members.
       Moderated   : yes
       Subscription: Debian Technical Committee only
 
   debian-ctte@lists.debian.org
 
-      Description : Debian Technical Committee
+      Description : Public meeting, business and announcements of the Debian
+                    Technical Committee
       Moderated   : subscribers
       Subscription: open
 
-  debian-custom@lists.debian.org
-
-      Description : Developing common infrastructure for custom Debian distributions
-      Moderated   : no
-      Subscription: open
-
   debian-dak@lists.debian.org
 
-      Description : Debian Archive Kit / Buildd list
+      Description : Discussion about the Debian Archive Software, consisting of dak for the
+                    archive and the buildd related parts wanna-build/sbuild.
       Moderated   : no
       Subscription: open
 
   debian-debbugs-cvs@lists.debian.org
 
-      Description : debbugs CVS commits
+      Description : CVS commit messages when modifications are done to
+                    debbugs
       Moderated   : yes
       Subscription: open
 
   debian-debbugs@lists.debian.org
 
-      Description : debbugs, the Debian bug tracking system
+      Description : Discussion and development of debbugs, the Debian
+                    Bug Tracking System software.
       Moderated   : no
       Subscription: open
 
   debian-desktop@lists.debian.org
 
-      Description : Debian Desktop project
+      Description : Discussion about the Debian Desktop sub-project,
+                    the integration of the various desktop-related
+                    packages, bug reports, questions and patches.
       Moderated   : no
       Subscription: open
 
   debian-devel-announce@lists.debian.org
 
-      Description : Announcements for developers
+      Description : Announcements of development issues like policy changes,
+                    important release issues &c.
       Moderated   : signed
       Subscription: open
 
   debian-devel-austrian
 
-      Description : Development discussions among Austrians
+      Description : Discussion among the Debian developers in Austria.
       Language    : (mostly) German
       Subscription: https://www.gibraltar.at/mailman/listinfo/debian-at
 
   debian-devel-french@lists.debian.org
 
-      Description : Development discussions in French
+      Description : This is the list used to discuss development
+                    issues in French.
       Language    : French
       Moderated   : no
       Subscription: open
 
   debian-devel-games@lists.debian.org
 
-      Description : Development of games in Debian
+      Description : Development and packaging discussion for games and game-related software in Debian.
+                    Identification of potential new games suitable for Debian. Discussion about
+                    infrastructure issues covering a wider range of games (e.g. multiplayer issues).
       Moderated   : no
       Subscription: open
 
   debian-devel-italian@lists.debian.org
 
-      Description : Development discussions in Italian
+      Description : Discussion on development issues in Italian.
       Language    : Italian
       Moderated   : no
       Subscription: open
 
   debian-devel-portuguese@lists.debian.org
 
-      Description : Development discussions in Portuguese
+      Description : This is the list used by Portuguese developers
+                    (or wannabes) to discuss development issues.
       Language    : Portuguese
       Moderated   : no
       Subscription: open
 
   debian-devel-spanish@lists.debian.org
 
-      Description : Development discussions in Spanish
+      Description : This is the list used by Spanish developers
+                    (or wannabes) to discuss issues besides
+                    translation: provide help for new Spanish
+                    developers, arrange key-signing meetings, arrange
+                    work in booths on different shows, share experience
+                    etc.
       Language    : Spanish
       Moderated   : no
       Subscription: open
 
   debian-devel@lists.debian.org
 
-      Description : Development of Debian
+      Description : Discussion about technical development topics.
+                    (High-volume mailing list.)
       Digest      : debian-devel-digest@lists.debian.org
       Moderated   : no
       Subscription: open
 
   debian-doc@lists.debian.org
 
-      Description : Writing documentation for Debian
+      Description : Debian Documentation Project: anything related
+                    to documentation in Debian is on topic here.
       Moderated   : no
       Subscription: open
 
   debian-dpkg-bugs@lists.debian.org
 
-      Description : dpkg bug reports
+      Description : Email sent by the bug tracking system regarding
+                    the dpkg packages.
       Moderated   : no
       Subscription: open
 
   debian-dpkg-cvs@lists.debian.org
 
-      Description : dpkg CVS commits
+      Description : The CVS commit messages from the dpkg CVS tree.
       Moderated   : yes
       Subscription: open
 
   debian-dpkg@lists.debian.org
 
-      Description : Development of dpkg
+      Description : Discussions and maintenance of dpkg, the basis of
+                    the Debian packaging system.
       Moderated   : no
       Subscription: open
 
   debian-edu-french@lists.debian.org
 
-      Description : Discussion between French educational Debian-based projects
+      Description : Discussions in french between all educational Debian-based projects.
+                    This list should ease the collaboration between the projects themselves
+                    and between Debian and those projects.
       Moderated   : no
       Subscription: open
 
   debian-edu@lists.debian.org
 
-      Description : Making Debian desirable for education purposes
+      Description : Making Debian the best distribution in the
+                    education landscape.
       Moderated   : no
       Subscription: open
 
   debian-emacsen@lists.debian.org
 
-      Description : Maintaining Emacsen
+      Description : Discussion of all things related to the several
+                    Debian Emacs packages and their add-ons.
       Moderated   : no
       Subscription: open
 
   debian-email@lists.debian.org
 
-      Description : Generic "grab-bag" list for Debian-related communication
+      Description : A generic "grab-bag" list for Debian related
+                    correspondence such as contacting upstream authors
+                    about licenses, bugs etc, or discussing the project
+                    with others where it might be useful to have the
+                    discussion archived somewhere.
+
+                    This list is archived internally on a Debian Project
+                    machine, only developers have access to the archive.
       Moderated   : no
       Subscription: developers only
 
   debian-embedded@lists.debian.org
 
-      Description : Debian on embedded systems
+      Description : Discussion about improving Debian for use with
+                    embedded systems, including building cross-compiler
+                    toolchains, cross-compiling packages, creating and
+                    updating system images, using alternate libraries,
+                    compile-time configuration of packages, etc.
       Moderated   : no
       Subscription: open
 
   debian-flash@lists.debian.org
 
-      Description : development and use of flash technologies on Debian
+      Description : For discussion of issues relating to the development and use of Debian for
+                    Flash development and viewing of Flash content. For general discussion of Flash
+                    related free software, please visit the osflash community: http://osflash.org
       Moderated   : no
       Subscription: open
 
   debian-gcc@lists.debian.org
 
-      Description : Debian GCC Maintainers
+      Description : Discussion on Debian packaging of GCC, the
+                    GNU compiler collection: bug reports, porting
+                    issues, any kind of questions or patches.
       Moderated   : no
       Subscription: open
 
-  debian-glibc@lists.debian.org
+  debian-gis@lists.debian.org
+
+      Description : Discussion about Geographical Information Systems (GIS) in Debian. For more
+                    information about the Debian GIS Blend see 
 
-      Description : Maintaining GNU C Library packages
+                    http://wiki.debian.org/DebianGis
       Moderated   : no
       Subscription: open
 
-  debian-gtk-gnome@lists.debian.org
+  debian-glibc@lists.debian.org
 
-      Description : Packages using GTK+ and/or GNOME
+      Description : Discussion on Debian packaging of the GNU C Library,
+                    the most important library on Debian systems.
       Moderated   : no
       Subscription: open
 
-  debian-hams@lists.debian.org
+  debian-gtk-gnome@lists.debian.org
 
-      Description : Development of HAM Radio under Debian
+      Description : Discussion and coordination among maintainers of
+                    Debian's GTK+, GNOME and dependent or related
+                    packages.
       Moderated   : no
       Subscription: open
 
-  debian-handheld@lists.debian.org
+  debian-hams@lists.debian.org
 
-      Description : Debian on handheld computers
+      Description : Support for HAMRadio within Debian GNU/Linux.
       Moderated   : no
       Subscription: open
 
   debian-haskell@lists.debian.org
 
-      Description : Haskell packages and maintenance
+      Description : Discussion of issues related to Haskell on Debian systems, with an
+                    emphasis towards coordinating Haskell packaging standards.  Relevant
+                    for anyone packaging Haskell compilers, libraries, or programs on
+                    Debian.
       Moderated   : no
       Subscription: open
 
   debian-ipv6@lists.debian.org
 
-      Description : IPv6 Maintenance
+      Description : Discussions on the use of Debian in an IPv6 network
+                    and implementing IPv6 support in Debian packages.
       Moderated   : no
       Subscription: open
 
   debian-java@lists.debian.org
 
-      Description : Java Maintenance
+      Description : Discussion about the packaging and use in Debian of VMs
+                    and compilers for the Java(tm) language, and programs
+                    written on it.
       Moderated   : no
       Subscription: open
 
   debian-jr@lists.debian.org
 
-      Description : Making Debian desirable for children
+      Description : Discussion and working on making Debian the sort
+                    of operating system that children will want to use.
+
+                    The Debian Jr. Project web page is at
+                    http://www.debian.org/devel/debian-jr/
       Moderated   : no
       Subscription: open
 
   debian-kernel-maint@lists.debian.org
 
-      Description : Debian kernel development and discussion
+      Description : Discussion and development of Debian kernel packaging,
+                    for the kernel team and other developers.
       Moderated   : no
       Subscription: open
 
   debian-kernel@lists.debian.org
 
-      Description : Kernel packages in Debian
+      Description : Kernels used with Debian (Linux, Hurd, etc.), available
+                    patches and flavors, packaging issues, bug reports,
+                    porting issues, automated tools, and any other
+                    questions or patches that are kernel-related. Mostly
+                    bug reporting is done here.
       Moderated   : no
       Subscription: open
 
   debian-knoppix@lists.debian.org
 
-      Description : Development of the Knoppix Live CD/DVD
+      Description : Development of the Debian-based live CD/DVD takes place.  As it is mainly a
+                    development list, user questions are best placed on the debian-user list.
       Moderated   : no
       Subscription: open
 
   debian-lex@lists.debian.org
 
-      Description : Making Debian desirable for lawyers
+      Description : Discussion on developing Debian into an operating
+                    system that is particularly well fit for the
+                    requirements for legal offices. The goal of
+                    Debian-Lex is a complete system for all tasks in
+                    legal practice which is built completely on free
+                    software.
       Moderated   : no
       Subscription: open
 
   debian-lint-maint@lists.debian.org
 
-      Description : Maintenance of Debian `lint' tools like lintian or linda
+      Description : The maintenance of Debian "lint" tools like lintian or linda
+                    is discussed on this list. This may or may not be limited to
+                    bug reports regarding the checks.
       Moderated   : no
       Subscription: open
 
   debian-live@lists.debian.org
 
-      Description : Discussion and maintenance of the Debian Live systems
+      Description : Development of the Debian Live systems (i.e. live cds).
       Moderated   : no
       Subscription: open
 
   debian-lsb@lists.debian.org
 
-      Description : Debian and the Linux Standard Base
+      Description : Discussion and coordination of efforts towards ensuring
+                    Debian meets the requirements of the Linux Standard Base.
       Moderated   : no
       Subscription: open
 
   debian-med@lists.debian.org
 
-      Description : Making Debian desirable for doctors
+      Description : Discussion on providing a free operating system
+                    for medical care.
+
+                    The Debian-Med Project web page is at
+                    http://www.debian.org/devel/debian-med/
       Moderated   : no
       Subscription: open
 
   debian-mentors@lists.debian.org
 
-      Description : Helping newbie developers
+      Description : Newbie Debian developers can seek help with
+                    packaging and other developer-related issues here.
+
+                    This list is not meant for users' questions,
+                    but for new maintainers'!
       Moderated   : no
       Subscription: open
 
   debian-multimedia@lists.debian.org
 
-      Description : Multimedia support and applications
+      Description : Discussion about the development of applications
+                    that produce multimedia content, handling multimedia
+                    data, supporting multimedia hardware etc.
       Moderated   : no
       Subscription: open
 
   debian-ocaml-maint@lists.debian.org
 
-      Description : ocaml package maintenance and development
+      Description : Packaging of Objective Caml programs and libraries.
+                    (http://pauillac.inria.fr/caml/)
       Moderated   : no
       Subscription: open
 
   debian-openoffice@lists.debian.org
 
-      Description : OpenOffice packages maintenance
+      Description : Coordination of the maintenance of the OpenOffice
+                    packages in Debian.
       Moderated   : no
       Subscription: open
 
   debian-perl@lists.debian.org
 
-      Description : Perl packages maintenance
+      Description : The list is dedicated to coordinate the work of various
+                    perl package maintainer and to write a kind of perl
+                    sub-policy.
       Moderated   : no
       Subscription: open
 
   debian-policy@lists.debian.org
 
-      Description : Creating and editing Debian Policy
+      Description : Discussion and editing of the Debian Policy Manual.
       Moderated   : no
       Subscription: open
 
   debian-printing@lists.debian.org
 
-      Description : Debian Printing Infrastructure
+      Description : Discussion of issues related to printing on Debian systems.  This
+                    covers all aspects of printing, from spoolers, to RIPs and printer
+                    drivers.  The list is used for coordination of development,
+                    integration and bugfixing of printing packages between package
+                    maintainers.  User printing and printing setup questions are also
+                    on topic.
       Moderated   : no
       Subscription: open
 
   debian-private@lists.debian.org
 
-      Description : Private discussions among developers
+      Description : Private discussions among developers: only for
+                    issues that may not be discussed on public lists.
+
+                    Anything sent there should be treated as sensitive
+                    and not to be spread to other lists; thus
+                    cross-posting between it and an open list defeats
+                    the purpose of this list.
+
+                    This list is archived internally on a Debian Project
+                    machine, only developers have access to the archive.
       Moderated   : no
       Subscription: developers only
 
   debian-python@lists.debian.org
 
-      Description : Python packages maintenance
+      Description : Discussion of issues related to Python on Debian
+                    systems with a stress on packaging standards. Therefore
+                    relevant for maintainers of Python related packages.
       Moderated   : no
       Subscription: open
 
   debian-qa-packages@lists.debian.org
 
-      Description : Orphaned packages maintained by the QA group
+      Description : Bug reports against orphaned packages and discussions
+                    about fixing them.
       Moderated   : no
       Subscription: open
 
   debian-qa@lists.debian.org
 
-      Description : Quality Assurance
+      Description : Quality assurance is important for a distribution. This
+                    list addresses this quality.
       Moderated   : no
       Subscription: open
 
   debian-qt-kde@lists.debian.org
 
-      Description : Packages using Qt and/or KDE
+      Description : Discussion and coordination among maintainers of
+                    Debian's Qt, KDE and dependent or related packages.
       Moderated   : no
       Subscription: open
 
   debian-release@lists.debian.org
 
-      Description : Coordinating Debian releases
+      Description : Coordination of Debian releases issues such as testing migrations, transitions
+                    and removals.
+                    
+                    This list should not be considered a discussion list; discussions related to
+                    releases issues should be held on more appropriate lists such as debian-devel,
+                    debian-legal or debian-project.
       Moderated   : no
       Subscription: open
 
   debian-ruby@lists.debian.org
 
-      Description : Ruby packages maintenance
+      Description : Discussion of issues related to Ruby on Debian systems
+                    with a stress on packaging standards. Therefore
+                    relevant for maintainers of Ruby related packages.
       Moderated   : no
       Subscription: open
 
   debian-science@lists.debian.org
 
-      Description : using debian for science and related research
+      Description : Discussion of issues relating to the use of Debian for science research,
+                    including useful packages, particular problems faced by scientists using
+                    Debian, how to make Debian more useful to scientists, etc.
       Moderated   : no
       Subscription: open
 
   debian-security-tracker@lists.debian.org
 
-      Description : Discussion about the Debian Security Tracker
+      Description : Discussion about topics that are relevant about the
+                    Debian Security Tracker, e.g. feature improvements,
+                    bugreports about incorrect data entries or server
+                    updates.
       Moderated   : no
       Subscription: open
 
   debian-sgml@lists.debian.org
 
-      Description : Debian and SGML
+      Description : Discussion of issues related to SGML on Debian systems
+                    with a stress on proper integration of tools, packaging
+                    standards and the writing of documentation for SGML
+                    users. Therefore relevant for maintainers of SGML
+                    related packages.
       Moderated   : no
       Subscription: open
 
   debian-ssh@lists.debian.org
 
-      Description : SSH packages maintenance
+      Description : Maintenance of the OpenSSH packages for Debian.
+                    It exists to facilitate coordination of ssh
+                    maintenance (talking to upstream, reproducing bugs,
+                    hacking on the code, etc.).
+
+                    It is *not* the place to mail bug reports
+                    (use the BTS for that), nor support requests.
       Moderated   : no
       Subscription: open
 
   debian-testing@lists.debian.org
 
-      Description : Testing for the next release
+      Description : Finding problems with the next Debian release:
+                    testing the installation and the upgrade process.
       Moderated   : no
       Subscription: open
 
   debian-tex-maint@lists.debian.org
 
-      Description : Coordination of the maintenance of TeX packages in Debian
+      Description : Coordination of the maintenance of Debian TeX
+                    and related packages.
+
+                    It is not meant for user support; for that, please
+                    use debian-user or one of the general TeX mailing
+                    lists or news groups.
       Moderated   : no
       Subscription: open
 
   debian-toolchain@lists.debian.org
 
-      Description : Compilers, assemblers etc.
+      Description : Discussion about the Debian toolchain: compilers,
+                    assemblers, linkers and such. New releases for
+                    many of these tools are coordinated here.
+      Moderated   : no
+      Subscription: open
+
+  debian-upstream@lists.debian.org
+
+      Description : A contact point for upstream software developers who want to get in touch with
+                    Debian, whether the software is already packaged for Debian or not.
       Moderated   : no
       Subscription: open
 
+  debian-wb-team@lists.debian.org
+
+      Description : Primary contact address for the wanna-build maintainers.
+                    Requests about this piece of infrastructure should
+                    be sent here. Discussions directly concerning wanna-build.
+      Moderated   : yes
+      Subscription: open
+
   debian-webapps@lists.debian.org
 
-      Description : Web applications packaging 
+      Description : This list is used to coordinate the maintenance of web application packages.
       Moderated   : no
       Subscription: open
 
   debian-wnpp@lists.debian.org
 
-      Description : Work-Needing and Prospective Packages
+      Description : Orphaning and adopting packages which is done through
+                    the `wnpp' BTS pseudo-package is recorded on this
+                    list. Additionally, discussion about particular bugs
+                    and the WNPP web pages is held here.
       Moderated   : no
       Subscription: open
 
   debian-www-cvs@lists.debian.org
 
-      Description : Web pages CVS commits
+      Description : CVS commit logs for the Debian web pages in the
+                    webwml CVS tree.
       Moderated   : yes
       Subscription: open
 
   debian-www@lists.debian.org
 
-      Description : Web pages design and maintenance
+      Description : Design, structure and translation of Debian
+                    web pages. All important changes to the web
+                    site are announced here as well.
       Moderated   : no
       Subscription: open
 
   debian-x@lists.debian.org
 
-      Description : Debian XFree86 packaging
+      Description : Discussion about the X Window System within Debian.
+                    This is NOT a user support list; this list is
+                    intended for those who deal with the source code.
       Moderated   : no
       Subscription: open
 
   deity@lists.debian.org
 
-      Description : APT packages maintenance
+      Description : Debian GNU/Linux will get a new, friendly frontend to
+                    its package maintenance system. Its codename is deity
+                    (now known as APT) and its development is discussed
+                    here. The -digest is open to everyone.
       Moderated   : no
       Subscription: open
 
@@ -787,196 +1123,256 @@ Internationalization and Translations
 
   debian-i18n@lists.debian.org
 
-      Description : Debian Internationalization
+      Description : Internationalization (i18n) of the distribution is
+                    discussed here.
       Moderated   : no
       Subscription: open
 
   debian-l10n-arabic@lists.debian.org
 
-      Description : Arabic Localization
+      Description : Discussing Arabic localization issues, mainly
+                    translating Debian docs and programs to Arabic.
       Language    : Arabic
       Moderated   : no
       Subscription: open
 
   debian-l10n-basque@lists.debian.org
 
-      Description : Basque localization
+      Description : Discussing Basque localization issues, mainly translating Debian
+                    docs and programs to Basque.
       Language    : Basque
       Moderated   : no
       Subscription: open
 
   debian-l10n-belarusian@lists.debian.org
 
-      Description : Belarusian Localization
+      Description : Discussing Belarusian localization issues, mainly
+                    translating Debian docs and programs to Belarusian.
       Language    : Belarusian
       Moderated   : no
       Subscription: open
 
   debian-l10n-catalan@lists.debian.org
 
-      Description : Catalan Localization
+      Description : Discussing Catalan localization issues, mainly
+                    translating Debian docs and programs to Catalan.
       Language    : Catalan
       Moderated   : no
       Subscription: open
 
+  debian-l10n-chinese@lists.debian.org
+
+      Description : Discussing Chinese localization issues, mainly translating Debian
+                    docs and programs to Chinese.
+      Language    : Chinese
+      Moderated   : no
+      Subscription: open
+
   debian-l10n-czech@lists.debian.org
 
-      Description : Czech Localization
+      Description : Discussion forum for the translators of
+                    Debian-specific packages and documentation to the Czech language.
       Moderated   : no
       Subscription: open
 
   debian-l10n-danish@lists.debian.org
 
-      Description : Danish Localization
+      Description : Discussing Danish localization issues, mainly
+                    translating Debian docs and programs to Danish.
       Language    : Danish
       Moderated   : no
       Subscription: open
 
   debian-l10n-dutch@lists.debian.org
 
-      Description : Dutch Localization
+      Description : Discussion forum for the translators of Debian-specific
+                    packages and documentation to the Dutch language.
       Language    : Dutch
       Moderated   : no
       Subscription: open
 
   debian-l10n-english@lists.debian.org
 
-      Description : English Localization
+      Description : Discussing English localization issues, mainly
+                    translating Debian docs and programs to English.
       Language    : English
       Moderated   : no
       Subscription: open
 
   debian-l10n-esperanto@lists.debian.org
 
-      Description : Esperanto Localization
+      Description : Discussing Esperanto localization issues, mainly
+                    translating Debian docs and programs to Esperanto.
       Language    : Esperanto
       Moderated   : no
       Subscription: open
 
   debian-l10n-finnish@lists.debian.org
 
-      Description : Finnish Localization
+      Description : Discussing Finnish localization issues, mainly
+                    translating Debian docs and programs to Finnish.
       Language    : Finnish
       Moderated   : no
       Subscription: open
 
   debian-l10n-french@lists.debian.org
 
-      Description : French Localization
+      Description : Discussion forum for the translators of Debian-specific
+                    packages and documentation to the French language.
       Language    : French
       Moderated   : no
       Subscription: open
 
   debian-l10n-galician@lists.debian.org
 
-      Description : Galician Localization
+      Description : Discussing Galician localization issues, mainly translating Debian docs and
+                    programs to Galician.
       Language    : Galician
       Moderated   : no
       Subscription: open
 
   debian-l10n-german@lists.debian.org
 
-      Description : German Localization
+      Description : Discussing German localization issues, mainly
+                    translating Debian docs and programs to German.
       Language    : German
       Moderated   : no
       Subscription: open
 
   debian-l10n-greek@lists.debian.org
 
-      Description : Greek Localization
+      Description : Discussion on Greek localization issues, mainly
+                    translating Debian docs and programs to Greek.
       Language    : Greek
       Moderated   : no
       Subscription: open
 
   debian-l10n-hungarian@lists.debian.org
 
-      Description : Hungarian Localization
+      Description : Discussing Hungarian localization issues, mainly
+                    translating Debian docs and programs to Hungarian.
       Language    : Hungarian
       Moderated   : no
       Subscription: open
 
+  debian-l10n-indonesian@lists.debian.org
+
+      Description : Discussing Indonesian localization issues, mainly translating Debian docs and
+                    website into Indonesian, improving Indonesian environment support in Debian.
+      Language    : Indonesian
+      Moderated   : no
+      Subscription: open
+
   debian-l10n-italian@lists.debian.org
 
-      Description : Italian Localization
+      Description : Italian localization efforts within Debian.
       Language    : Italian
       Moderated   : no
       Subscription: open
 
   debian-l10n-kannada@lists.debian.org
 
-      Description : Kannada Localization
+      Description : Debian Kannada (kn_IN) localization, documentation and web site translation,
+                    user support, user-developers coordination
       Language    : Kannada
       Moderated   : no
       Subscription: open
 
   debian-l10n-korean@lists.debian.org
 
-      Description : Korean Localization
+      Description : Discussion forum for the translators of Debian-specific packages and
+                    documentation to the Korean language.
       Moderated   : no
       Subscription: open
 
   debian-l10n-malayalam@lists.debian.org
 
-      Description : Malayalam Localization
+      Description : Discussion forum for the translators of Debian-specific packages and
+                    documentation to the Malayalam language.
       Language    : Malayalam
       Moderated   : no
       Subscription: open
 
   debian-l10n-persian@lists.debian.org
 
-      Description : Persian/Farsi Localization
+      Description : Discussing Persian/Farsi localization issues, mainly translating
+                    Debian docs and programs to Persian/Farsi.
       Language    : Persian
       Moderated   : no
       Subscription: open
 
   debian-l10n-polish@lists.debian.org
 
-      Description : Polish Localization
+      Description : Polish localization issues, mainly translating Debian
+                    web pages, documentation and programs to Polish.
       Language    : Polish
       Moderated   : no
       Subscription: open
 
   debian-l10n-portuguese@lists.debian.org
 
-      Description : Portuguese Localization
+      Description : Portuguese localization issues such as translating
+                    the documentation and programs.
       Language    : Portuguese
       Moderated   : no
       Subscription: open
 
   debian-l10n-romanian@lists.debian.org
 
-      Description : Romanian Localization
+      Description : Discussing Romanian localization issues, mainly
+                    translating Debian docs and programs to Romanian.
       Language    : Romanian
       Moderated   : no
       Subscription: open
 
   debian-l10n-russian@lists.debian.org
 
-      Description : Russian Localization
+      Description : Discussing Russian localization issues, mainly
+                    translating Debian docs and programs to Russian.
       Language    : Russian
       Moderated   : no
       Subscription: open
 
+  debian-l10n-sicilian@lists.debian.org
+
+      Description : Sicilian localization issues within Debian.
+      Language    : Sicilian
+      Moderated   : no
+      Subscription: open
+
   debian-l10n-spanish@lists.debian.org
 
-      Description : Spanish Localization
+      Description : Discussing Spanish localization issues, mainly
+                    translating Debian docs and programs to Spanish.
       Language    : Spanish
       Moderated   : no
       Subscription: open
 
   debian-l10n-swedish@lists.debian.org
 
-      Description : Swedish Localization
+      Description : Discussion forum for translators of Debian-specific packages
+                    and documentation for the Swedish language.
       Moderated   : no
       Subscription: open
 
   debian-l10n-turkish@lists.debian.org
 
-      Description : Turkish Localization
+      Description : Discussing Turkish localization issues, mainly
+                    translating Debian docs and website into Turkish,
+                    improving Turkish environment support in Debian.
       Language    : Turkish
       Moderated   : no
       Subscription: open
 
+  debian-l10n-vietnamese@lists.debian.org
+
+      Description : This is the Debian localization list for Vietnamese localization announcements
+                    and translation status checks, discussions between Vietnamese translators and
+                    questions from Vietnamese community users with language-related issues.
+      Language    : Vietnamese
+      Moderated   : no
+      Subscription: open
+
 Ports to non-i386 Linux architectures and to non-Linux kernels
 
   Debian GNU/Linux is ported to several other types of computers, and there
@@ -984,91 +1380,96 @@ Ports to non-i386 Linux architectures and to non-Linux kernels
 
   debian-68k@lists.debian.org
 
-      Description : Debian port to m68k
+      Description : Discussions on the m68k port of Debian GNU/Linux.
       Moderated   : no
       Subscription: open
 
   debian-alpha@lists.debian.org
 
-      Description : Debian port to Alpha
+      Description : Discussion on the Alpha port of Debian GNU/Linux.
       Moderated   : no
       Subscription: open
 
   debian-amd64@lists.debian.org
 
-      Description : Debian port to AMD64
+      Description : Porting Debian to AMD x86-64 architecture.
       Moderated   : no
       Subscription: open
 
   debian-arm@lists.debian.org
 
-      Description : Debian port to ARM
+      Description : Discussion on the ARM port for Debian GNU/Linux.
       Moderated   : no
       Subscription: open
 
   debian-bsd@lists.debian.org
 
-      Description : Debian port to BSD
+      Description : Porting Debian to BSD (all *BSD variants).
       Moderated   : no
       Subscription: open
 
   debian-hppa@lists.debian.org
 
-      Description : Debian port to HPPA
+      Description : Discussions on the PA-RISC port of Debian GNU/Linux.
       Moderated   : no
       Subscription: open
 
   debian-hurd@lists.debian.org
 
-      Description : Debian port to Hurd
+      Description : Debian port of the GNU Hurd operating system.
       Moderated   : no
       Subscription: open
 
   debian-ia64@lists.debian.org
 
-      Description : Debian port to Intel IA-64
+      Description : Discussions on the intel IA64 (aka Itanium, Merced)
+                    port of Debian GNU/Linux.
       Moderated   : no
       Subscription: open
 
   debian-interix@lists.debian.org
 
-      Description : Debian port to Interix
+      Description : Discussion on the Interix port of Debian/GNU.
+                    For more information see: http://www.debian-interix.net/
       Moderated   : no
       Subscription: open
 
   debian-mips@lists.debian.org
 
-      Description : Debian port to MIPS
+      Description : Discussions on the MIPS port of Debian GNU/Linux.
       Moderated   : no
       Subscription: open
 
   debian-powerpc@lists.debian.org
 
-      Description : Debian port to PowerPC
+      Description : Discussion on the PowerPC port of Debian GNU/Linux.
       Moderated   : no
       Subscription: open
 
   debian-s390@lists.debian.org
 
-      Description : Debian port to IBM S/390
+      Description : Discussions on the IBM S/390 port of Debian GNU/Linux.
       Moderated   : no
       Subscription: open
 
   debian-sparc@lists.debian.org
 
-      Description : Debian port to SPARC
+      Description : Discussions on the SPARC port of Debian GNU/Linux.
       Moderated   : no
       Subscription: open
 
   debian-superh@lists.debian.org
 
-      Description : Debian port to SuperH
+      Description : Discussions on the SuperH port of Debian GNU/Linux. For
+                    more information about running Linux on SH processors,
+                    have a look at http://www.m17n.org/linux-sh/
       Moderated   : no
       Subscription: open
 
   debian-win32@lists.debian.org
 
-      Description : Debian port to Win32
+      Description : Porting the Debian distribution to Win32 systems
+                    (Debian GNU/Win32).
       Moderated   : no
       Subscription: open
 
@@ -1080,25 +1481,31 @@ The Bug Tracking System
 
   debian-bugs-closed@lists.debian.org
 
-      Description : Debian BTS, closed bugs
+      Description : Messages that close Debian bug reports.
       Moderated   : yes
       Subscription: open
 
   debian-bugs-dist@lists.debian.org
 
-      Description : Debian BTS, received bugs
+      Description : All submitted bug reports as well as further information
+                    on them are distributed here.
       Moderated   : yes
       Subscription: open
 
   debian-bugs-forwarded@lists.debian.org
 
-      Description : Debian BTS, forwarded bugs
+      Description : Mails in which Debian maintainers forward bugs
+                    to their upstream authors.
       Moderated   : yes
       Subscription: open
 
   debian-bugs-rc@lists.debian.org
 
-      Description : Debian BTS, release-critical bugs
+      Description : All mail regarding release-critical bugs is
+                    copied to this mailing list.
+
+                    See http://bugs.debian.org/release-critical/
+                    for more information.
       Moderated   : yes
       Subscription: open
 
@@ -1111,119 +1518,212 @@ Miscellaneous Debian lists
 
   debian-admin@lists.debian.org
 
-      Description : Internal list for Debian Project machine admins
+      Description : This is our internal list used for administering the
+                    Debian machine park.
       Moderated   : no
       Subscription: closed
 
+  debian-backports-changes@lists.debian.org
+
+      Description : Changes to the "debian-backports" distribution are announced
+                    here. This includes queued and dak mail.
+      Moderated   : yes
+      Subscription: open
+
   debian-changes@lists.debian.org
 
-      Description : Stable packages' upgrade announcements
+      Description : Changes to the releases are announced here. This
+                    includes security upgrades as well as important
+                    bugfixes.
       Digest      : debian-changes-digest@lists.debian.org
       Moderated   : yes
       Subscription: open
 
   debian-consultants@lists.debian.org
 
-      Description : Debian consultants, paid support
+      Description : Communication among Debian consultants. See at the bottom of the
+                    consultants page (http://www.debian.org/consultants/#policy) for how
+                    to add/update entries to this page.
       Moderated   : no
       Subscription: open
 
   debian-curiosa@lists.debian.org
 
-      Description : All the funny stuff regarding Debian
+      Description : Funny thing from and with the project, funny quotes,
+                    discussions irc communication and fortune cookies.
+                    Some kind of (de.)alt.netdigest for Debian-related stuff.
       Moderated   : no
       Subscription: open
 
   debian-devel-changes@lists.debian.org
 
-      Description : Unstable packages' upgrade announcements
+      Description : Notices about uploaded packages for the unstable
+                    distribution, from developers, buildds and katie,
+                    the archive sentinel.
+                    (High-volume mailing list.)
       Moderated   : yes
       Subscription: open
 
+  debian-dug-in@lists.debian.org
+
+      Description : Discussion list for the Debian community in India without being tied to a
+                    particular group in order to link all groups and individuals in the country and
+                    facilitate the coordination of local events.
+      Moderated   : no
+      Subscription: open
+
+  debian-dug-mx@lists.debian.org
+
+      Description : Discussion list for the Debian community in Mexico without being tied to a
+                    particular group in order to link all groups and individuals in the country and
+                    facilitate the coordination of local events.
+      Moderated   : no
+      Subscription: open
+
   debian-events-eu@lists.debian.org
 
-      Description : Events with Debian affiliation in Europe
+      Description : Discussions and organizational stuff about booths for
+                    Debian at european exhibitions.
+      Moderated   : no
+      Subscription: open
+
+  debian-events-ha@lists.debian.org
+
+      Description : Mailing list for announcements and events organization
+                    with Debian affiliation in Hispanic America.
       Moderated   : no
       Subscription: open
 
   debian-events-na@lists.debian.org
 
-      Description : Events with Debian affiliation in North America
+      Description : Discussions and organizational stuff about booths and
+                    presentations for Debian at North American exhibitions.
       Moderated   : no
       Subscription: open
 
   debian-events-nl@lists.debian.org
 
-      Description : Events with Debian affiliation in the Netherlands
+      Description : Announcements of small meetings and keysigning parties of Dutch
+                    Debian Developers and other discussions of interest mainly for
+                    Debian people in the Netherlands. Posts in both Dutch and English
+                    are common.
       Moderated   : no
       Subscription: open
 
   debian-jobs@lists.debian.org
 
-      Description : Job postings for members of the Debian community
+      Description : Job postings can be published on this list in
+                    order to make them public to members of the Debian
+                    community.  While the jobs do not necessarily have
+                    to involve the use of Debian, it is encouraged that
+                    they do.  Jobs can be about the development of
+                    proprietary system, but jobs involving free software
+                    (either development or system administration) are
+                    preferred.  Please include information such as
+                    location and remuneration if appropriate.  The list
+                    is moderated; it is also an open list - job postings
+                    which have to be kept private should be sent to
+                    leader@debian.org who will distribute them.
       Moderated   : yes
       Subscription: open
 
   debian-legal@lists.debian.org
 
-      Description : Copyright, licensing and patent issues
+      Description : Discussions about legality issues such as
+                    copyrights, patents etc.
       Moderated   : no
       Subscription: open
 
   debian-mirrors-announce@lists.debian.org
 
-      Description : News and announcements regarding FTP archive mirrors
+      Description : Important changes to the FTP archive are announced here.
+                    These are mainly useful to maintainers of Debian
+                    mirrors.
       Moderated   : signed
       Subscription: open
 
   debian-mirrors@lists.debian.org
 
-      Description : Discussions about the Debian mirror network
+      Description : Discussions relating to the Debian mirror network,
+                    and the maintenance of mirrors.
       Moderated   : no
       Subscription: open
 
   debian-newmaint@lists.debian.org
 
-      Description : Debian New Maintainer process discussion
+      Description : Discussion about the Debian New Maintainer process,
+                    application manager reports etc.
       Moderated   : no
       Subscription: open
 
   debian-project@lists.debian.org
 
-      Description : Discussions about non-technical issues in the project
+      Description : Discussion about non-technical topics related
+                    to the Debian Project.
       Moderated   : no
       Subscription: open
 
   debian-publicity@lists.debian.org
 
-      Description : Making Debian famous
+      Description : Coordination of all the work related to the external
+                    communication of Debian: drafting new announces,
+                    collecting important information that Debian should relay
+                    to its community, improving the infrastructure offered to
+                    people who want to create Debian booth, etc.
+      Moderated   : no
+      Subscription: open
+
+  debian-snapshot@lists.debian.org
+
+      Description : This list covers discussion and maintenance of the snapshot.debian.org archive
+                    as well as the development of enhancements of this service.
       Moderated   : no
       Subscription: open
 
   debian-testing-changes@lists.debian.org
 
-      Description : Testing packages' upgrade announcements
+      Description : Changes to the "testing" distribution are announced
+                    here. This includes various bugfixes.
       Moderated   : yes
       Subscription: open
 
   debian-vote@lists.debian.org
 
-      Description : Voting announcements and discussion
+      Description : Proposals, discussions and announcements related to
+                    Official Debian Votes.
       Moderated   : no
       Subscription: open
 
   debian-women@lists.debian.org
 
-      Description : Discussion and collaboration involving women in Debian
+      Description : Debian users and developers who wish to involve more
+                    women in the Debian project. For discussion and
+                    sharing of ideas as well as project collaboration.
       Moderated   : no
       Subscription: open
 
   whitelist@lists.debian.org
 
-      Description : Generic whitelist
+      Description : This is a special pseudo-mailing list to which
+                    people can subscribe to prove they are not
+                    spammers.
+
+                    This allows one to avoid the restrictions imposed
+                    on non-subscriber posts to other mailing lists,
+                    in particular the mailing lists that allow posts
+                    only from subscribers.
       Moderated   : yes
       Subscription: open
 
+Other
+
+
+  debian-derivatives@lists.debian.org
+
+      Description : front-desk for developers of Debian-based distributions
+      Moderated   : no
+      Subscription: open
+
 Lists hosted for other projects
 
   Our list server provides mailing list facilities for other free
@@ -1231,13 +1731,18 @@ Lists hosted for other projects
 
   other-cdwrite@lists.debian.org
 
-      Description : cdwrite
+      Description : cdwrite mailing list
       Moderated   : no
       Subscription: open
 
   other-sart@lists.debian.org
 
-      Description : Discussions and announcements about SART
+      Description : Discussions and announcements about SART,
+                    a free raytracer that uses Guile extension
+                    language and is distributed under GPL. 
+
+                    The SART website is at
+                    http://petra.zesoi.fer.hr/~silovic/sart/
       Moderated   : no
       Subscription: open
 
diff --git a/includes/squeeze/install/README.html b/includes/squeeze/install/README.html
index 17e103c9e..b0cfebc06 100644
--- a/includes/squeeze/install/README.html
+++ b/includes/squeeze/install/README.html
@@ -57,7 +57,7 @@
 
     <p id="breadcrumbs">
       <span class="alt">(<a href= "README.txt">Text version</a>)</span>
-      Debian GNU/Linux 5.0.0 "Lenny" - Official i386 NETINST Binary-1 20090214-14:36
+      Debian GNU/Linux squeeze-di-rc2 "Squeeze" - Official Snapshot i386 NETINST Binary-1 20110121-20:12
     </p>
   </div><!-- end header -->
 
@@ -104,15 +104,12 @@
     </h2>
 
     <p>This disc is labeled
-    <small><strong>Debian GNU/Linux 5.0.0 "Lenny" - Official i386 NETINST Binary-1 20090214-14:36</strong></small>
+    <small><strong>Debian GNU/Linux squeeze-di-rc2 "Squeeze" - Official Snapshot i386 NETINST Binary-1 20110121-20:12</strong></small>
     .
     It contains programs ("binaries") for `i386' computers.</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>
 
     <h2 id="install">
       Installing
@@ -122,9 +119,12 @@
     installation procedure may seem a bit unusual. You can install
     Debian GNU/Linux either <em>alongside</em> your current OS, or as
     the <em>only</em> OS on your computer.</p>
-    <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>As this is not an official squeeze release disc, then the
+    installation guide many not be released yet. It will appear on <a
+    href="http://www.debian.org/releases/squeeze/installmanual">the
+    Debian web site</a> when ready, but before then you could try <a
+    href="http://d-i.alioth.debian.org/manual/">the development
+    version of the manual</a>.
     </p>
 
     <p>For the impatient ones: you can start the installation program easily by
@@ -146,10 +146,9 @@
       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>
+     <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/squeeze/install/README.mirrors.html b/includes/squeeze/install/README.mirrors.html
index 6d01dfb2d..7d918fadc 100644
--- a/includes/squeeze/install/README.mirrors.html
+++ b/includes/squeeze/install/README.mirrors.html
@@ -48,9 +48,9 @@ please have the site maintainer fill out the form at:
 Everything else you want to know about Debian mirrors:
 <a href="http://www.debian.org/mirror/">                        http://www.debian.org/mirror/</a>.<br>
 
-<h2 align="center">Primary Debian mirror sites</h2>
+<h2 class="center">Primary Debian mirror sites</h2>
 
-<table border="0" align="center">
+<table border="0" class="center">
 <tr>
   <th>Country</th>
   <th>Site</th>
@@ -59,222 +59,247 @@ 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 mips mipsel powerpc s390 sparc</small></small></td>
+  <td><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 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 mips mipsel powerpc s390 sparc</small></small></td>
+  <td><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc</small></small></td>
+</tr>
+<tr>
+  <td>Bosnia&nbsp;& Herzegovina</td>
+  <td><a href="http://ftp.ba.debian.org/debian/">ftp.ba.debian.org/debian/</a></td>
+  <td><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 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 mips mipsel powerpc s390 sparc</small></small></td>
+  <td><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 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 mips mipsel powerpc s390 sparc</small></small></td>
+  <td><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 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 mips mipsel powerpc s390 sparc</small></small></td>
+  <td><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc</small></small></td>
+</tr>
+<tr>
+  <td>Belarus</td>
+  <td><a href="http://ftp.by.debian.org/debian/">ftp.by.debian.org/debian/</a></td>
+  <td><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 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 mips mipsel powerpc s390 sparc</small></small></td>
+  <td><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 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 mips mipsel powerpc s390 sparc</small></small></td>
+  <td><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 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 mips mipsel powerpc s390 sparc</small></small></td>
+  <td><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 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 mips mipsel powerpc s390 sparc</small></small></td>
+  <td><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 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 mips mipsel powerpc s390 sparc</small></small></td>
+  <td><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 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 mips mipsel powerpc s390 sparc</small></small></td>
+  <td><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 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 mips mipsel powerpc s390 sparc</small></small></td>
+  <td><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 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 mips mipsel powerpc s390 sparc</small></small></td>
+  <td><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 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 mips mipsel powerpc s390 sparc</small></small></td>
+  <td><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 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 mips mipsel powerpc s390 sparc</small></small></td>
+  <td><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 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 mips mipsel powerpc s390 sparc</small></small></td>
+  <td><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 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 mips mipsel powerpc s390 sparc</small></small></td>
+  <td><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 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 mips mipsel powerpc s390 sparc</small></small></td>
+  <td><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 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 mips mipsel powerpc s390 sparc</small></small></td>
+  <td><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
   <td>Hong&nbsp;Kong</td>
   <td><a href="http://ftp.hk.debian.org/debian/">ftp.hk.debian.org/debian/</a></td>
-  <td><small><small>alpha amd64 arm armel i386 ia64 powerpc sparc</small></small></td>
+  <td><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <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 mips mipsel powerpc s390 sparc</small></small></td>
+  <td><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 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 mips mipsel powerpc s390 sparc</small></small></td>
+  <td><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 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 mips mipsel powerpc s390 sparc</small></small></td>
+  <td><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 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 mips mipsel powerpc s390 sparc</small></small></td>
+  <td><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 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 mips mipsel powerpc s390 sparc</small></small></td>
+  <td><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 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 mips mipsel powerpc s390 sparc</small></small></td>
+  <td><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 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 mips mipsel powerpc s390 sparc</small></small></td>
+  <td><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 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 mips mipsel powerpc s390 sparc</small></small></td>
+  <td><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc</small></small></td>
+</tr>
+<tr>
+  <td>Lithuania</td>
+  <td><a href="http://ftp.lt.debian.org/debian/">ftp.lt.debian.org/debian/</a></td>
+  <td><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 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 mips mipsel powerpc s390 sparc</small></small></td>
+  <td><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc</small></small></td>
+</tr>
+<tr>
+  <td>New&nbsp;Caledonia</td>
+  <td><a href="http://ftp.nc.debian.org/debian/">ftp.nc.debian.org/debian/</a></td>
+  <td><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 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 mips mipsel powerpc s390 sparc</small></small></td>
+  <td><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
   <td>Norway</td>
   <td><a href="http://ftp.no.debian.org/debian/">ftp.no.debian.org/debian/</a></td>
-  <td><small><small>amd64 i386 ia64 powerpc sparc</small></small></td>
+  <td><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <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 mips mipsel powerpc s390 sparc</small></small></td>
+  <td><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 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 mips mipsel powerpc s390 sparc</small></small></td>
+  <td><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 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 mips mipsel powerpc s390 sparc</small></small></td>
+  <td><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 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 mips mipsel powerpc s390 sparc</small></small></td>
+  <td><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 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 mips mipsel powerpc s390 sparc</small></small></td>
+  <td><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 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 mips mipsel powerpc s390 sparc</small></small></td>
+  <td><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 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>amd64 i386 powerpc sparc</small></small></td>
+  <td><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 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 mips mipsel powerpc s390 sparc</small></small></td>
+  <td><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc</small></small></td>
+</tr>
+<tr>
+  <td>Thailand</td>
+  <td><a href="http://ftp.th.debian.org/debian/">ftp.th.debian.org/debian/</a></td>
+  <td><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 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 armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
+  <td><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 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 mips mipsel powerpc s390 sparc</small></small></td>
+  <td><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 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>
+  <td><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 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 mips mipsel powerpc s390 sparc</small></small></td>
+  <td><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 </table>
 <h2 align="center">Secondary mirrors of the Debian archive</h2>
 
-<table border="0" align="center">
+<table border="0" class="center">
 <tr>
   <th>Host name</th>
   <th>FTP</th>
@@ -286,22 +311,16 @@ Everything else you want to know about Debian mirrors:
 <tr><td colspan=4><big><strong>AR Argentina</strong></big></td></tr>
 
 <tr>
-<td valign=top>debian.logiclinux.com</td>
-<td></td>
-<td valign=top><a href="http://debian.logiclinux.com/debian/">/debian/</a></td>
-<td valign=top><small><small>amd64 i386</small></small></td>
-</tr>
-<tr>
 <td valign=top>ftp.ccc.uba.ar</td>
 <td valign=top><a href="ftp://ftp.ccc.uba.ar/pub/linux/debian/debian/">/pub/linux/debian/debian/</a></td>
 <td valign=top><a href="http://ftp.ccc.uba.ar/pub/linux/debian/debian/">/pub/linux/debian/debian/</a></td>
-<td valign=top><small><small>amd64 i386</small></small></td>
+<td valign=top><small><small>amd64 i386 kfreebsd-amd64 kfreebsd-i386</small></small></td>
 </tr>
 <tr>
 <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 mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>amd64 arm armel hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 powerpc</small></small></td>
 </tr>
 
 <tr><td colspan=4><hr size=1></td></tr>
@@ -311,43 +330,43 @@ 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 mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 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></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 mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>debian.mur.at</td>
 <td valign=top><a href="ftp://debian.mur.at/debian/">/debian/</a></td>
 <td valign=top><a href="http://debian.mur.at/debian/">/debian/</a></td>
-<td valign=top><small><small>amd64 i386 ia64</small></small></td>
+<td valign=top><small><small>amd64 i386 ia64 kfreebsd-amd64 kfreebsd-i386</small></small></td>
 </tr>
 <tr>
 <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 mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>ftp.univie.ac.at</td>
 <td valign=top><a href="ftp://ftp.univie.ac.at/systems/linux/debian/debian/">/systems/linux/debian/debian/</a></td>
 <td valign=top><a href="http://ftp.univie.ac.at/systems/linux/debian/debian/">/systems/linux/debian/debian/</a></td>
-<td valign=top><small><small>i386</small></small></td>
+<td valign=top><small><small>i386 kfreebsd-amd64 kfreebsd-i386</small></small></td>
 </tr>
 <tr>
 <td valign=top>debian.inode.at</td>
 <td valign=top><a href="ftp://debian.inode.at/debian/">/debian/</a></td>
 <td valign=top><a href="http://debian.inode.at/debian/">/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel i386 powerpc sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel i386 kfreebsd-amd64 kfreebsd-i386 powerpc sparc</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 mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 
 <tr><td colspan=4><hr size=1></td></tr>
@@ -357,25 +376,25 @@ 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 mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 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 mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>ftp.monash.edu.au</td>
 <td valign=top><a href="ftp://ftp.monash.edu.au/pub/linux/debian/">/pub/linux/debian/</a></td>
 <td valign=top><a href="http://ftp.monash.edu.au/pub/linux/debian/">/pub/linux/debian/</a></td>
-<td valign=top><small><small>amd64 i386</small></small></td>
+<td valign=top><small><small>amd64 i386 kfreebsd-amd64 kfreebsd-i386</small></small></td>
 </tr>
 <tr>
 <td valign=top>ftp.uwa.edu.au</td>
 <td valign=top><a href="ftp://ftp.uwa.edu.au/debian/">/debian/</a></td>
 <td valign=top><a href="http://ftp.uwa.edu.au/debian/">/debian/</a></td>
-<td valign=top><small><small>amd64 i386</small></small></td>
+<td valign=top><small><small>amd64 i386 kfreebsd-amd64 kfreebsd-i386</small></small></td>
 </tr>
 <tr>
 <td valign=top>mirror.eftel.com</td>
@@ -387,81 +406,97 @@ 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 mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 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 mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 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 mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>mirror.cse.unsw.edu.au</td>
 <td valign=top><a href="ftp://mirror.cse.unsw.edu.au/debian/">/debian/</a></td>
 <td valign=top><a href="http://mirror.cse.unsw.edu.au/debian/">/debian/</a></td>
-<td valign=top><small><small>amd64 i386 ia64 powerpc</small></small></td>
-</tr>
-<tr>
-<td valign=top>mirror.3fl.net.au</td>
-<td valign=top><a href="ftp://mirror.3fl.net.au/pub/debian/">/pub/debian/</a></td>
-<td valign=top><a href="http://mirror.3fl.net.au/debian/">/debian/</a></td>
-<td valign=top><small><small>amd64 i386</small></small></td>
+<td valign=top><small><small>amd64 i386 ia64 kfreebsd-amd64 kfreebsd-i386 powerpc</small></small></td>
 </tr>
 <tr>
 <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 mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc</small></small></td>
+</tr>
+<tr>
+<td valign=top>mirror.waia.asn.au</td>
+<td valign=top><a href="ftp://mirror.waia.asn.au/debian/">/debian/</a></td>
+<td valign=top><a href="http://mirror.waia.asn.au/debian/">/debian/</a></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc</small></small></td>
+</tr>
+<tr>
+<td valign=top>mirror.transact.net.au</td>
+<td valign=top><a href="ftp://mirror.transact.net.au/debian/">/debian/</a></td>
+<td valign=top><a href="http://mirror.transact.net.au/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>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>
+<td valign=top>ftp.ba.debian.org<br>  (mirror.debian.com.ba)</td>
+<td valign=top><a href="ftp://ftp.ba.debian.org/debian/">/debian/</a></td>
+<td valign=top><a href="http://ftp.ba.debian.org/debian/">/debian/</a></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc</small></small></td>
+</tr>
+
+<tr><td colspan=4><hr size=1></td></tr>
+<tr><td colspan=4><big><strong>BD Bangladesh</strong></big></td></tr>
+
+<tr>
+<td valign=top>mirrors.ispros.com.bd</td>
+<td valign=top><a href="ftp://mirrors.ispros.com.bd/debian/">/debian/</a></td>
+<td valign=top><a href="http://mirrors.ispros.com.bd/debian/">/debian/</a></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 
 <tr><td colspan=4><hr size=1></td></tr>
 <tr><td colspan=4><big><strong>BE Belgium</strong></big></td></tr>
 
 <tr>
-<td valign=top>ftp.be.debian.org<br>  (ftp.belnet.be)</td>
+<td valign=top>ftp.be.debian.org<br>  (mirror.be.gbxs.net)</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 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 mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 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 mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>amd64 armel hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mipsel powerpc sparc</small></small></td>
+</tr>
+<tr>
+<td valign=top>ftp.belnet.be</td>
+<td valign=top><a href="ftp://ftp.belnet.be/debian/">/debian/</a></td>
+<td valign=top><a href="http://ftp.belnet.be/debian/">/debian/</a></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 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 mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 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 mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top>mirror.eurid.eu</td>
+<td valign=top><a href="ftp://mirror.eurid.eu/debian/">/debian/</a></td>
+<td valign=top><a href="http://mirror.eurid.eu/debian/">/debian/</a></td>
+<td valign=top><small><small>amd64 i386</small></small></td>
 </tr>
 
 <tr><td colspan=4><hr size=1></td></tr>
@@ -471,7 +506,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 mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>debian.ludost.net</td>
@@ -483,25 +518,31 @@ 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 mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 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 mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>debian.mnet.bg</td>
 <td valign=top><a href="ftp://debian.mnet.bg/debian/">/debian/</a></td>
 <td valign=top><a href="http://debian.mnet.bg/debian/">/debian/</a></td>
-<td valign=top><small><small>i386</small></small></td>
+<td valign=top><small><small>amd64 i386</small></small></td>
 </tr>
 <tr>
 <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 armel i386</small></small></td>
+<td valign=top><small><small>amd64 armel i386 kfreebsd-amd64 kfreebsd-i386</small></small></td>
+</tr>
+<tr>
+<td valign=top>debian.ipacct.com</td>
+<td valign=top><a href="ftp://debian.ipacct.com/debian/">/debian/</a></td>
+<td valign=top><a href="http://debian.ipacct.com/debian/">/debian/</a></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 
 <tr><td colspan=4><hr size=1></td></tr>
@@ -511,37 +552,25 @@ 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 mips mipsel powerpc s390 sparc</small></small></td>
-</tr>
-<tr>
-<td valign=top>debian.das.ufsc.br</td>
-<td valign=top><a href="ftp://debian.das.ufsc.br/pub/debian/">/pub/debian/</a></td>
-<td></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 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <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 mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 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 mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>linorg.usp.br</td>
 <td valign=top><a href="ftp://linorg.usp.br/debian/">/debian/</a></td>
 <td valign=top><a href="http://linorg.usp.br/debian/">/debian/</a></td>
-<td valign=top><small><small>i386</small></small></td>
-</tr>
-<tr>
-<td valign=top>linux.iq.usp.br</td>
-<td></td>
-<td valign=top><a href="http://linux.iq.usp.br/debian/">/debian/</a></td>
-<td valign=top><small><small>amd64 i386</small></small></td>
+<td valign=top><small><small>i386 kfreebsd-amd64 kfreebsd-i386</small></small></td>
 </tr>
 <tr>
 <td valign=top>ftp.pucpr.br</td>
@@ -559,22 +588,28 @@ Everything else you want to know about Debian mirrors:
 <td valign=top>debian.pop-sc.rnp.br</td>
 <td></td>
 <td valign=top><a href="http://debian.pop-sc.rnp.br/debian/">/debian/</a></td>
-<td valign=top><small><small>amd64 i386</small></small></td>
+<td valign=top><small><small>amd64 i386 kfreebsd-amd64 kfreebsd-i386</small></small></td>
+</tr>
+<tr>
+<td valign=top>debs.ifsul.edu.br</td>
+<td valign=top><a href="ftp://debs.ifsul.edu.br/debian/">/debian/</a></td>
+<td valign=top><a href="http://debs.ifsul.edu.br/debian/">/debian/</a></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 
 <tr><td colspan=4><hr size=1></td></tr>
 <tr><td colspan=4><big><strong>BY Belarus</strong></big></td></tr>
 
 <tr>
-<td valign=top>linux.org.by</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>
+<td valign=top>ftp.by.debian.org<br>  (ftp.mgts.by)</td>
+<td valign=top><a href="ftp://ftp.by.debian.org/debian/">/debian/</a></td>
+<td valign=top><a href="http://ftp.by.debian.org/debian/">/debian/</a></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
-<td valign=top>ftp.mgts.by</td>
-<td valign=top><a href="ftp://ftp.mgts.by/debian/">/debian/</a></td>
-<td valign=top><a href="http://ftp.mgts.by/debian/">/debian/</a></td>
+<td valign=top>linux.org.by</td>
+<td valign=top><a href="ftp://linux.org.by/debian/">/debian/</a></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>
 
@@ -585,7 +620,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 mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>debian.yorku.ca</td>
@@ -597,55 +632,55 @@ 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 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 mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 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/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>alpha amd64 arm armel 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 kfreebsd-amd64 kfreebsd-i386 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>amd64 i386</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc</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 mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>debian.savoirfairelinux.net</td>
 <td valign=top><a href="ftp://debian.savoirfairelinux.net/debian/">/debian/</a></td>
 <td valign=top><a href="http://debian.savoirfairelinux.net/debian/">/debian/</a></td>
-<td valign=top><small><small>amd64 i386 powerpc</small></small></td>
+<td valign=top><small><small>amd64 i386 kfreebsd-amd64 kfreebsd-i386 powerpc</small></small></td>
 </tr>
 <tr>
 <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 mips mipsel powerpc s390 sparc</small></small></td>
-</tr>
-<tr>
-<td valign=top>mirror.publicns.net</td>
-<td valign=top><a href="ftp://mirror.publicns.net/pub/debian/">/pub/debian/</a></td>
-<td valign=top><a href="http://mirror.publicns.net/pub/debian/">/pub/debian/</a></td>
-<td valign=top><small><small>amd64 armel i386</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <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 mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc</small></small></td>
+</tr>
+<tr>
+<td valign=top>mirror.its.dal.ca</td>
+<td valign=top><a href="ftp://mirror.its.dal.ca/debian/">/debian/</a></td>
+<td valign=top><a href="http://mirror.its.dal.ca/debian/">/debian/</a></td>
+<td valign=top><small><small>alpha amd64 arm armel hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 sparc</small></small></td>
+</tr>
+<tr>
+<td valign=top>mirrors.ece.ubc.ca</td>
+<td></td>
+<td valign=top><a href="http://mirrors.ece.ubc.ca/debian/">/debian/</a></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 
 <tr><td colspan=4><hr size=1></td></tr>
@@ -655,35 +690,29 @@ 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 mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 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 mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>debian.csg.uzh.ch</td>
 <td></td>
 <td valign=top><a href="http://debian.csg.uzh.ch/debian/">/debian/</a></td>
-<td valign=top><small><small>amd64 i386</small></small></td>
+<td valign=top><small><small>amd64 i386 kfreebsd-amd64 kfreebsd-i386</small></small></td>
 </tr>
 
 <tr><td colspan=4><hr size=1></td></tr>
 <tr><td colspan=4><big><strong>CL Chile</strong></big></td></tr>
 
 <tr>
-<td valign=top>ftp.cl.debian.org<br>  (debian.ciencias.uchile.cl)</td>
+<td valign=top>ftp.cl.debian.org<br>  (debian.netlinux.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 mips mipsel powerpc s390 sparc</small></small></td>
-</tr>
-<tr>
-<td valign=top>debian.ubiobio.cl</td>
-<td></td>
-<td valign=top><a href="http://debian.ubiobio.cl/debian/">/debian/</a></td>
-<td valign=top><small><small>amd64 i386 powerpc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>debian.utalca.cl</td>
@@ -691,18 +720,6 @@ Everything else you want to know about Debian mirrors:
 <td valign=top><a href="http://debian.utalca.cl/debian/">/debian/</a></td>
 <td valign=top><small><small>amd64 i386</small></small></td>
 </tr>
-<tr>
-<td valign=top>mirror.debian.cl</td>
-<td></td>
-<td valign=top><a href="http://mirror.debian.cl/debian/">/debian/</a></td>
-<td valign=top><small><small>amd64 i386</small></small></td>
-</tr>
-<tr>
-<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>
 <tr><td colspan=4><big><strong>CN China</strong></big></td></tr>
@@ -711,13 +728,33 @@ 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 mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 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 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 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc</small></small></td>
+</tr>
+
+<tr><td colspan=4><hr size=1></td></tr>
+<tr><td colspan=4><big><strong>CO Colombia</strong></big></td></tr>
+
+<tr>
+<td valign=top>debian.unal.edu.co</td>
+<td valign=top><a href="ftp://debian.unal.edu.co/debian/">/debian/</a></td>
+<td valign=top><a href="http://debian.unal.edu.co/debian/">/debian/</a></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc</small></small></td>
+</tr>
+
+<tr><td colspan=4><hr size=1></td></tr>
+<tr><td colspan=4><big><strong>CR Costa Rica</strong></big></td></tr>
+
+<tr>
+<td valign=top>mirrors.ucr.ac.cr</td>
+<td valign=top><a href="ftp://mirrors.ucr.ac.cr/debian/">/debian/</a></td>
+<td valign=top><a href="http://mirrors.ucr.ac.cr/debian/">/debian/</a></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 
 <tr><td colspan=4><hr size=1></td></tr>
@@ -727,37 +764,49 @@ 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 mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 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 mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>ftp.zcu.cz</td>
 <td valign=top><a href="ftp://ftp.zcu.cz/mirrors/debian/">/mirrors/debian/</a></td>
 <td valign=top><a href="http://ftp.zcu.cz/mirrors/debian/">/mirrors/debian/</a></td>
-<td valign=top><small><small>amd64 i386</small></small></td>
+<td valign=top><small><small>amd64 i386 kfreebsd-amd64 kfreebsd-i386</small></small></td>
 </tr>
 <tr>
 <td valign=top>debian.mirror.web4u.cz</td>
 <td valign=top><a href="ftp://debian.mirror.web4u.cz/">/</a></td>
 <td valign=top><a href="http://debian.mirror.web4u.cz/">/</a></td>
-<td valign=top><small><small>amd64 i386</small></small></td>
+<td valign=top><small><small>amd64 i386 kfreebsd-amd64 kfreebsd-i386</small></small></td>
 </tr>
 <tr>
 <td valign=top>ftp.cvut.cz</td>
 <td valign=top><a href="ftp://ftp.cvut.cz/debian/">/debian/</a></td>
 <td valign=top><a href="http://ftp.cvut.cz/debian/">/debian/</a></td>
-<td valign=top><small><small>amd64 i386 ia64</small></small></td>
+<td valign=top><small><small>amd64 i386 ia64 kfreebsd-amd64 kfreebsd-i386</small></small></td>
 </tr>
 <tr>
 <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 armel 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 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc</small></small></td>
+</tr>
+<tr>
+<td valign=top>debian.mirror.dkm.cz</td>
+<td valign=top><a href="ftp://debian.mirror.dkm.cz/debian/">/debian/</a></td>
+<td valign=top><a href="http://debian.mirror.dkm.cz/debian/">/debian/</a></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc</small></small></td>
+</tr>
+<tr>
+<td valign=top>debian.superhosting.cz</td>
+<td valign=top><a href="ftp://debian.superhosting.cz/debian/">/debian/</a></td>
+<td valign=top><a href="http://debian.superhosting.cz/debian/">/debian/</a></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 
 <tr><td colspan=4><hr size=1></td></tr>
@@ -767,31 +816,43 @@ 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 mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 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>ftp2.de.debian.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 mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 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 mips powerpc sparc</small></small></td>
+<td valign=top><a href="http://ftp.tu-clausthal.de/pub/linux/debian/">/pub/linux/debian/</a></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc</small></small></td>
+</tr>
+<tr>
+<td valign=top>ftp.rfc822.org</td>
+<td valign=top><a href="ftp://ftp.rfc822.org/debian/">/debian/</a></td>
+<td valign=top><a href="http://ftp.rfc822.org/debian/">/debian/</a></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 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 mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 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 mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc</small></small></td>
+</tr>
+<tr>
+<td valign=top>ftp.uni-erlangen.de</td>
+<td valign=top><a href="ftp://ftp.uni-erlangen.de/debian/">/debian/</a></td>
+<td valign=top><a href="http://ftp.uni-erlangen.de/debian/">/debian/</a></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>ftp.informatik.rwth-aachen.de</td>
@@ -800,34 +861,34 @@ Everything else you want to know about Debian mirrors:
 <td valign=top><small><small>alpha amd64 i386 powerpc sparc</small></small></td>
 </tr>
 <tr>
-<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 mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top>ftp-stud.hs-esslingen.de</td>
+<td valign=top><a href="ftp://ftp-stud.hs-esslingen.de/debian/">/debian/</a></td>
+<td valign=top><a href="http://ftp-stud.hs-esslingen.de/debian/">/debian/</a></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>ftp.stw-bonn.de</td>
 <td valign=top><a href="ftp://ftp.stw-bonn.de/debian/">/debian/</a></td>
 <td valign=top><a href="http://ftp.stw-bonn.de/debian/">/debian/</a></td>
-<td valign=top><small><small>amd64 i386</small></small></td>
+<td valign=top><small><small>amd64 i386 kfreebsd-amd64 kfreebsd-i386</small></small></td>
 </tr>
 <tr>
 <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 mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 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 mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>ftp.uni-koeln.de</td>
 <td valign=top><a href="ftp://ftp.uni-koeln.de/debian/">/debian/</a></td>
 <td valign=top><a href="http://ftp.uni-koeln.de/debian/">/debian/</a></td>
-<td valign=top><small><small>alpha amd64 i386 powerpc sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 i386 kfreebsd-amd64 kfreebsd-i386 powerpc sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>ftp.mpi-sb.mpg.de</td>
@@ -839,61 +900,61 @@ Everything else you want to know about Debian mirrors:
 <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 mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>ftp.uni-kl.de</td>
 <td valign=top><a href="ftp://ftp.uni-kl.de/debian/">/debian/</a></td>
 <td valign=top><a href="http://ftp.uni-kl.de/debian/">/debian/</a></td>
-<td valign=top><small><small>amd64 i386 ia64 powerpc sparc</small></small></td>
+<td valign=top><small><small>amd64 i386 ia64 kfreebsd-amd64 kfreebsd-i386 powerpc sparc</small></small></td>
 </tr>
 <tr>
 <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 mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 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 mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 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 mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 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 mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>ftp.informatik.uni-frankfurt.de</td>
 <td valign=top><a href="ftp://ftp.informatik.uni-frankfurt.de/pub/Mirrors/debian.org/debian/">/pub/Mirrors/debian.org/debian/</a></td>
 <td valign=top><a href="http://ftp.informatik.uni-frankfurt.de/debian/">/debian/</a></td>
-<td valign=top><small><small>amd64 i386 ia64 powerpc</small></small></td>
+<td valign=top><small><small>amd64 i386 ia64 kfreebsd-amd64 kfreebsd-i386 powerpc</small></small></td>
 </tr>
 <tr>
 <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 mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>artfiles.org</td>
 <td valign=top><a href="ftp://artfiles.org/debian/">/debian/</a></td>
 <td valign=top><a href="http://artfiles.org/debian/">/debian/</a></td>
-<td valign=top><small><small>amd64 i386</small></small></td>
+<td valign=top><small><small>amd64 i386 kfreebsd-amd64 kfreebsd-i386</small></small></td>
 </tr>
 <tr>
 <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 mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>debian.cruisix.net</td>
@@ -911,19 +972,43 @@ Everything else you want to know about Debian mirrors:
 <td valign=top>debian.charite.de</td>
 <td></td>
 <td valign=top><a href="http://debian.charite.de/debian/">/debian/</a></td>
-<td valign=top><small><small>i386</small></small></td>
+<td valign=top><small><small>i386 kfreebsd-amd64 kfreebsd-i386</small></small></td>
 </tr>
 <tr>
 <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 mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <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>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 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>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc</small></small></td>
+</tr>
+<tr>
+<td valign=top>debian.morphium.info</td>
+<td valign=top><a href="ftp://debian.morphium.info/debian/">/debian/</a></td>
+<td valign=top><a href="http://debian.morphium.info/debian/">/debian/</a></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc</small></small></td>
+</tr>
+<tr>
+<td valign=top>mirror.unitedcolo.de</td>
+<td valign=top><a href="ftp://mirror.unitedcolo.de/debian/">/debian/</a></td>
+<td valign=top><a href="http://mirror.unitedcolo.de/debian/">/debian/</a></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc</small></small></td>
+</tr>
+<tr>
+<td valign=top>mirror.1und1.de</td>
+<td valign=top><a href="ftp://mirror.1und1.de/debian/">/debian/</a></td>
+<td valign=top><a href="http://mirror.1und1.de/debian/">/debian/</a></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 
 <tr><td colspan=4><hr size=1></td></tr>
@@ -933,19 +1018,7 @@ 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 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 mips mipsel powerpc s390 sparc</small></small></td>
-</tr>
-<tr>
-<td valign=top>debian.uni-c.dk</td>
-<td></td>
-<td valign=top><a href="http://debian.uni-c.dk/debian/">/debian/</a></td>
-<td valign=top><small><small>alpha amd64 i386 ia64 powerpc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>mirrors.telianet.dk</td>
@@ -954,10 +1027,20 @@ Everything else you want to know about Debian mirrors:
 <td valign=top><small><small>amd64 i386 powerpc sparc</small></small></td>
 </tr>
 <tr>
-<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 armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top>mirrors.rackhosting.com</td>
+<td valign=top><a href="ftp://mirrors.rackhosting.com/debian/">/debian/</a></td>
+<td valign=top><a href="http://mirrors.rackhosting.com/debian/">/debian/</a></td>
+<td valign=top><small><small>amd64 i386 ia64 kfreebsd-amd64 kfreebsd-i386 sparc</small></small></td>
+</tr>
+
+<tr><td colspan=4><hr size=1></td></tr>
+<tr><td colspan=4><big><strong>DZ Algeria</strong></big></td></tr>
+
+<tr>
+<td valign=top>debian.usthb.dz</td>
+<td valign=top><a href="ftp://debian.usthb.dz/debian/">/debian/</a></td>
+<td valign=top><a href="http://debian.usthb.dz/debian/">/debian/</a></td>
+<td valign=top><small><small>i386</small></small></td>
 </tr>
 
 <tr><td colspan=4><hr size=1></td></tr>
@@ -967,65 +1050,59 @@ 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 mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 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>  (ftp.gul.uc3m.es)</td>
+<td valign=top>ftp.es.debian.org<br>  (ulises.hostalia.com)</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 mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>ftp.rediris.es</td>
 <td valign=top><a href="ftp://ftp.rediris.es/debian/">/debian/</a></td>
 <td valign=top><a href="http://ftp.rediris.es/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 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <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>amd64 i386 ia64 powerpc</small></small></td>
+<td valign=top><small><small>amd64 i386 ia64 kfreebsd-amd64 kfreebsd-i386 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 armel i386 ia64 powerpc</small></small></td>
+<td valign=top><small><small>amd64 armel i386 ia64 kfreebsd-amd64 kfreebsd-i386 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 mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
-<td valign=top>ftp.um.es</td>
-<td valign=top><a href="ftp://ftp.um.es/mirror/debian/">/mirror/debian/</a></td>
-<td></td>
-<td valign=top><small><small>i386</small></small></td>
+<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 kfreebsd-amd64 kfreebsd-i386 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 mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>debian.grn.cat</td>
 <td valign=top><a href="ftp://debian.grn.cat/debian/">/debian/</a></td>
 <td valign=top><a href="http://debian.grn.cat/debian/">/debian/</a></td>
-<td valign=top><small><small>amd64 i386 ia64 powerpc</small></small></td>
-</tr>
-<tr>
-<td valign=top>debian.com.es</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 mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>amd64 i386 ia64 kfreebsd-amd64 kfreebsd-i386 powerpc</small></small></td>
 </tr>
 
 <tr><td colspan=4><hr size=1></td></tr>
@@ -1035,13 +1112,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 mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 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 mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>ftp.jyu.fi</td>
@@ -1063,79 +1140,73 @@ 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 mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 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 mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 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 armel 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 kfreebsd-amd64 kfreebsd-i386 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 amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top>debian.polytech-lille.fr</td>
+<td valign=top><a href="ftp://debian.polytech-lille.fr/debian/">/debian/</a></td>
+<td valign=top><a href="http://debian.polytech-lille.fr/debian/">/debian/</a></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 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 mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>ftp.lip6.fr</td>
 <td valign=top><a href="ftp://ftp.lip6.fr/pub/linux/distributions/debian/">/pub/linux/distributions/debian/</a></td>
 <td valign=top><a href="http://ftp.lip6.fr/pub/linux/distributions/debian/">/pub/linux/distributions/debian/</a></td>
-<td valign=top><small><small>amd64 i386</small></small></td>
+<td valign=top><small><small>amd64 i386 kfreebsd-amd64 kfreebsd-i386</small></small></td>
 </tr>
 <tr>
 <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 mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 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 mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 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 mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 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 armel hurd-i386 i386 ia64 powerpc sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 armel hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 powerpc sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>debian.cict.fr</td>
 <td valign=top><a href="ftp://debian.cict.fr/debian/">/debian/</a></td>
 <td valign=top><a href="http://debian.cict.fr/debian/">/debian/</a></td>
-<td valign=top><small><small>amd64 arm armel hurd-i386 i386</small></small></td>
+<td valign=top><small><small>amd64 arm armel hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386</small></small></td>
 </tr>
 <tr>
-<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 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 mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top>mirror.ovh.net</td>
+<td valign=top><a href="ftp://mirror.ovh.net/debian/">/debian/</a></td>
+<td valign=top><a href="http://mirror.ovh.net/debian/">/debian/</a></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>ftp.nerim.net</td>
@@ -1147,37 +1218,43 @@ 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 mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 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 mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 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>amd64 i386 kfreebsd-amd64 kfreebsd-i386</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 mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 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 mips mipsel powerpc sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>debian.mirror.inra.fr</td>
 <td valign=top><a href="ftp://debian.mirror.inra.fr/debian/">/debian/</a></td>
 <td valign=top><a href="http://debian.mirror.inra.fr/debian/">/debian/</a></td>
-<td valign=top><small><small>amd64 arm armel i386 ia64 powerpc sparc</small></small></td>
+<td valign=top><small><small>amd64 arm armel i386 ia64 kfreebsd-amd64 kfreebsd-i386 powerpc sparc</small></small></td>
 </tr>
 <tr>
 <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 mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>ftp.univ-pau.fr</td>
@@ -1189,59 +1266,83 @@ 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 mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 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>alpha amd64 arm armel 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 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc</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 kfreebsd-amd64 kfreebsd-i386 powerpc</small></small></td>
 </tr>
 <tr>
 <td valign=top>debian.univ-reims.fr</td>
 <td valign=top><a href="ftp://debian.univ-reims.fr/debian/">/debian/</a></td>
 <td valign=top><a href="http://debian.univ-reims.fr/debian/">/debian/</a></td>
-<td valign=top><small><small>amd64 i386</small></small></td>
+<td valign=top><small><small>amd64 i386 kfreebsd-amd64 kfreebsd-i386</small></small></td>
+</tr>
+<tr>
+<td valign=top>debian.advalem.net</td>
+<td valign=top><a href="ftp://debian.advalem.net/debian/">/debian/</a></td>
+<td valign=top><a href="http://debian.advalem.net/debian/">/debian/</a></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc</small></small></td>
+</tr>
+<tr>
+<td valign=top>ftp.ec-m.fr</td>
+<td valign=top><a href="ftp://ftp.ec-m.fr/debian/">/debian/</a></td>
+<td valign=top><a href="http://ftp.ec-m.fr/debian/">/debian/</a></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc</small></small></td>
+</tr>
+<tr>
+<td valign=top>deb-mir1.naitways.net</td>
+<td></td>
+<td valign=top><a href="http://deb-mir1.naitways.net/debian/">/debian/</a></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 
 <tr><td colspan=4><hr size=1></td></tr>
 <tr><td colspan=4><big><strong>GB Great Britain</strong></big></td></tr>
 
 <tr>
-<td valign=top>ftp.uk.debian.org<br>  (debian.hands.com)</td>
+<td valign=top>ftp.uk.debian.org<br>  (free.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 mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 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>amd64 hurd-i386 i386</small></small></td>
+<td valign=top><small><small>amd64 hurd-i386 i386 kfreebsd-amd64 kfreebsd-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></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 mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc</small></small></td>
+</tr>
+<tr>
+<td valign=top>ftp.mirrorservice.org</td>
+<td valign=top><a href="ftp://ftp.mirrorservice.org/sites/ftp.debian.org/debian/">/sites/ftp.debian.org/debian/</a></td>
+<td></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 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 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 mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>mirror.positive-internet.com</td>
 <td valign=top><a href="ftp://mirror.positive-internet.com/debian/">/debian/</a></td>
 <td valign=top><a href="http://mirror.positive-internet.com/debian/">/debian/</a></td>
-<td valign=top><small><small>amd64 hppa i386 ia64 powerpc sparc</small></small></td>
+<td valign=top><small><small>amd64 hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 powerpc sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>the.earth.li</td>
@@ -1253,35 +1354,25 @@ 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 mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 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 mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
-<td valign=top>debian.zetnet.co.uk</td>
-<td valign=top><a href="ftp://debian.zetnet.co.uk/debian/">/debian/</a></td>
-<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>
+<td valign=top>mirrors.melbourne.co.uk</td>
+<td valign=top><a href="ftp://mirrors.melbourne.co.uk/debian/">/debian/</a></td>
+<td valign=top><a href="http://mirrors.melbourne.co.uk/debian/">/debian/</a></td>
+<td valign=top><small><small>amd64 hurd-i386 i386</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>
-
-<tr>
-<td valign=top>ftp.ifg.gtu.ge</td>
-<td valign=top><a href="ftp://ftp.ifg.gtu.ge/debian/">/debian/</a></td>
-<td></td>
-<td valign=top><small><small>amd64 i386</small></small></td>
+<td valign=top>mirror.bytemark.co.uk</td>
+<td valign=top><a href="ftp://mirror.bytemark.co.uk/debian/">/debian/</a></td>
+<td valign=top><a href="http://mirror.bytemark.co.uk/debian/">/debian/</a></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 
 <tr><td colspan=4><hr size=1></td></tr>
@@ -1291,31 +1382,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 mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 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 mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 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 mips mipsel powerpc s390 sparc</small></small></td>
+<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 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
-<td valign=top>ftp.softnet.tuc.gr</td>
+<td valign=top>postmortem.csd.auth.gr</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 mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><a href="http://postmortem.csd.auth.gr/debian/">/debian/</a></td>
+<td valign=top><small><small>amd64 i386</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 mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top>ftp.uoi.gr</td>
+<td valign=top><a href="ftp://ftp.uoi.gr/debian/">/debian/</a></td>
+<td valign=top><a href="http://ftp.uoi.gr/debian/">/debian/</a></td>
+<td valign=top><small><small>amd64 hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 powerpc</small></small></td>
 </tr>
 
 <tr><td colspan=4><hr size=1></td></tr>
@@ -1325,7 +1416,7 @@ Everything else you want to know about Debian mirrors:
 <td valign=top>ftp.hk.debian.org</td>
 <td valign=top><a href="ftp://ftp.hk.debian.org/debian/">/debian/</a></td>
 <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>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 
 <tr><td colspan=4><hr size=1></td></tr>
@@ -1335,7 +1426,7 @@ 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 mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>ftp.irb.hr</td>
@@ -1347,13 +1438,13 @@ Everything else you want to know about Debian mirrors:
 <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 mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>debian.iskon.hr</td>
 <td valign=top><a href="ftp://debian.iskon.hr/debian/">/debian/</a></td>
 <td valign=top><a href="http://debian.iskon.hr/debian/">/debian/</a></td>
-<td valign=top><small><small>amd64 hurd-i386 i386 ia64 s390</small></small></td>
+<td valign=top><small><small>amd64 hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 s390</small></small></td>
 </tr>
 
 <tr><td colspan=4><hr size=1></td></tr>
@@ -1363,30 +1454,30 @@ 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 mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 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 amd64 arm armel 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 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>ftp.bme.hu</td>
-<td valign=top><a href="ftp://ftp.bme.hu/OS/Linux/dist/debian/">/OS/Linux/dist/debian/</a></td>
-<td valign=top><a href="http://ftp.bme.hu/OS/Linux/dist/debian/">/OS/Linux/dist/debian/</a></td>
-<td valign=top><small><small>amd64 hurd-i386 i386 ia64</small></small></td>
+<td valign=top><a href="ftp://ftp.bme.hu/debian/">/debian/</a></td>
+<td valign=top><a href="http://ftp.bme.hu/debian/">/debian/</a></td>
+<td valign=top><small><small>amd64 i386</small></small></td>
 </tr>
 <tr>
 <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 mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>debian.sth.sze.hu</td>
 <td valign=top><a href="ftp://debian.sth.sze.hu/debian/">/debian/</a></td>
-<td valign=top><a href="http://debian.sth.sze.hu/">/</a></td>
+<td valign=top><a href="http://debian.sth.sze.hu/debian/">/debian/</a></td>
 <td valign=top><small><small>amd64 i386 ia64</small></small></td>
 </tr>
 
@@ -1400,10 +1491,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>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>
+<td valign=top>kambing.ui.ac.id</td>
+<td valign=top><a href="ftp://kambing.ui.ac.id/debian/">/debian/</a></td>
+<td valign=top><a href="http://kambing.ui.ac.id/debian/">/debian/</a></td>
+<td valign=top><small><small>amd64 i386 ia64 sparc</small></small></td>
 </tr>
 
 <tr><td colspan=4><hr size=1></td></tr>
@@ -1413,13 +1504,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 mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 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 mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 
 <tr><td colspan=4><hr size=1></td></tr>
@@ -1429,7 +1520,7 @@ Everything else you want to know about Debian mirrors:
 <td valign=top>debian.co.il</td>
 <td></td>
 <td valign=top><a href="http://debian.co.il/debian/">/debian/</a></td>
-<td valign=top><small><small>i386</small></small></td>
+<td valign=top><small><small>amd64 i386 kfreebsd-amd64 kfreebsd-i386</small></small></td>
 </tr>
 <tr>
 <td valign=top>mirror.isoc.org.il</td>
@@ -1445,6 +1536,12 @@ Everything else you want to know about Debian mirrors:
 <td valign=top>ftp.iitm.ac.in</td>
 <td valign=top><a href="ftp://ftp.iitm.ac.in/debian/">/debian/</a></td>
 <td valign=top><a href="http://ftp.iitm.ac.in/debian/">/debian/</a></td>
+<td valign=top><small><small>amd64 i386 kfreebsd-amd64 kfreebsd-i386</small></small></td>
+</tr>
+<tr>
+<td valign=top>mirror.cse.iitk.ac.in</td>
+<td valign=top><a href="ftp://mirror.cse.iitk.ac.in/debian/">/debian/</a></td>
+<td valign=top><a href="http://mirror.cse.iitk.ac.in/debian/">/debian/</a></td>
 <td valign=top><small><small>amd64 i386</small></small></td>
 </tr>
 
@@ -1455,7 +1552,13 @@ 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 mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc</small></small></td>
+</tr>
+<tr>
+<td valign=top>debian.simnet.is</td>
+<td valign=top><a href="ftp://debian.simnet.is/debian/">/debian/</a></td>
+<td valign=top><a href="http://debian.simnet.is/debian/">/debian/</a></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 
 <tr><td colspan=4><hr size=1></td></tr>
@@ -1465,7 +1568,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 mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>giano.com.dist.unige.it</td>
@@ -1474,12 +1577,6 @@ Everything else you want to know about Debian mirrors:
 <td valign=top><small><small>amd64 arm armel i386</small></small></td>
 </tr>
 <tr>
-<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 mips mipsel powerpc s390 sparc</small></small></td>
-</tr>
-<tr>
 <td valign=top>freedom.dicea.unifi.it</td>
 <td valign=top><a href="ftp://freedom.dicea.unifi.it/pub/linux/debian/">/pub/linux/debian/</a></td>
 <td valign=top><a href="http://freedom.dicea.unifi.it/ftp/pub/linux/debian/">/ftp/pub/linux/debian/</a></td>
@@ -1489,19 +1586,13 @@ Everything else you want to know about Debian mirrors:
 <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 mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 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 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 mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>debian.fastbull.org</td>
@@ -1519,7 +1610,13 @@ 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>amd64 i386</small></small></td>
+<td valign=top><small><small>amd64 i386 kfreebsd-amd64 kfreebsd-i386</small></small></td>
+</tr>
+<tr>
+<td valign=top>debian.bononia.it</td>
+<td valign=top><a href="ftp://debian.bononia.it/debian/">/debian/</a></td>
+<td valign=top><a href="http://debian.bononia.it/debian/">/debian/</a></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 
 <tr><td colspan=4><hr size=1></td></tr>
@@ -1529,79 +1626,67 @@ 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 mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 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="ftp://ftp.jp.debian.org/debian/">/debian/</a></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 mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 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 mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 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 mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 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 mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 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 mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 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>
-<td valign=top><a href="ftp://sb.itc.u-tokyo.ac.jp/DEBIAN/">/DEBIAN/</a></td>
-<td valign=top><a href="http://sb.itc.u-tokyo.ac.jp/DEBIAN/">/DEBIAN/</a></td>
-<td valign=top><small><small>amd64 hurd-i386 i386 powerpc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <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 mips mipsel powerpc s390 sparc</small></small></td>
-</tr>
-<tr>
-<td valign=top>debian.shimpinomori.net</td>
-<td></td>
-<td valign=top><a href="http://debian.shimpinomori.net/debian/">/debian/</a></td>
-<td valign=top><small><small>amd64 i386 powerpc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 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 mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>www.cohsoft.com</td>
 <td></td>
 <td valign=top><a href="http://www.cohsoft.com/debian/">/debian/</a></td>
-<td valign=top><small><small>amd64 hurd-i386 i386 powerpc</small></small></td>
+<td valign=top><small><small>amd64 hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 powerpc</small></small></td>
 </tr>
 <tr>
 <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 mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 
 <tr><td colspan=4><hr size=1></td></tr>
@@ -1611,23 +1696,49 @@ 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 mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 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 mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc</small></small></td>
+</tr>
+
+<tr><td colspan=4><hr size=1></td></tr>
+<tr><td colspan=4><big><strong>KR Korea (South)</strong></big></td></tr>
+
+<tr>
+<td valign=top>ftp.lecl.net</td>
+<td valign=top><a href="ftp://ftp.lecl.net/debian/">/debian/</a></td>
+<td valign=top><a href="http://ftp.lecl.net/debian/">/debian/</a></td>
+<td valign=top><small><small>amd64 i386 sparc</small></small></td>
+</tr>
+
+<tr><td colspan=4><hr size=1></td></tr>
+<tr><td colspan=4><big><strong>KZ Kazakhstan</strong></big></td></tr>
+
+<tr>
+<td valign=top>mirror.neolabs.kz</td>
+<td valign=top><a href="ftp://mirror.neolabs.kz/debian/">/debian/</a></td>
+<td valign=top><a href="http://mirror.neolabs.kz/debian/">/debian/</a></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 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>ftp.lt.debian.org</td>
+<td valign=top><a href="ftp://ftp.lt.debian.org/debian/">/debian/</a></td>
+<td valign=top><a href="http://ftp.lt.debian.org/debian/">/debian/</a></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc</small></small></td>
+</tr>
+<tr>
 <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>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>debian.balt.net</td>
@@ -1635,24 +1746,56 @@ Everything else you want to know about Debian mirrors:
 <td valign=top><a href="http://debian.balt.net/debian/">/debian/</a></td>
 <td valign=top><small><small>amd64 arm armel i386 sparc</small></small></td>
 </tr>
+<tr>
+<td valign=top>debian.mirror.vu.lt</td>
+<td valign=top><a href="ftp://debian.mirror.vu.lt/debian/">/debian/</a></td>
+<td valign=top><a href="http://debian.mirror.vu.lt/debian/">/debian/</a></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc</small></small></td>
+</tr>
+
+<tr><td colspan=4><hr size=1></td></tr>
+<tr><td colspan=4><big><strong>LU Luxembourg</strong></big></td></tr>
+
+<tr>
+<td valign=top>debian.mirror.root.lu</td>
+<td valign=top><a href="ftp://debian.mirror.root.lu/debian/">/debian/</a></td>
+<td valign=top><a href="http://debian.mirror.root.lu/debian/">/debian/</a></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc</small></small></td>
+</tr>
 
 <tr><td colspan=4><hr size=1></td></tr>
 <tr><td colspan=4><big><strong>LV Latvia</strong></big></td></tr>
 
 <tr>
-<td valign=top>koyanet.lv</td>
-<td valign=top><a href="ftp://koyanet.lv/debian/">/debian/</a></td>
-<td valign=top><a href="http://koyanet.lv/debian/">/debian/</a></td>
-<td valign=top><small><small>amd64 i386</small></small></td>
+<td valign=top>debian.koyanet.lv</td>
+<td valign=top><a href="ftp://debian.koyanet.lv/debian/">/debian/</a></td>
+<td valign=top><a href="http://debian.koyanet.lv/debian/">/debian/</a></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc</small></small></td>
+</tr>
+<tr>
+<td valign=top>debian.linux.edu.lv</td>
+<td valign=top><a href="ftp://debian.linux.edu.lv/debian/">/debian/</a></td>
+<td valign=top><a href="http://debian.linux.edu.lv/debian/">/debian/</a></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc</small></small></td>
+</tr>
+
+<tr><td colspan=4><hr size=1></td></tr>
+<tr><td colspan=4><big><strong>MD Moldova</strong></big></td></tr>
+
+<tr>
+<td valign=top>debian.md</td>
+<td valign=top><a href="ftp://debian.md/debian/">/debian/</a></td>
+<td valign=top><a href="http://debian.md/debian/">/debian/</a></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 
 <tr><td colspan=4><hr size=1></td></tr>
 <tr><td colspan=4><big><strong>MT Malta</strong></big></td></tr>
 
 <tr>
-<td valign=top>debian.eng.um.edu.mt</td>
+<td valign=top>debian.res.um.edu.mt</td>
 <td></td>
-<td valign=top><a href="http://debian.eng.um.edu.mt/debian/">/debian/</a></td>
+<td valign=top><a href="http://debian.res.um.edu.mt/debian/">/debian/</a></td>
 <td valign=top><small><small>amd64 i386</small></small></td>
 </tr>
 
@@ -1663,23 +1806,23 @@ 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 mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <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>
+<td valign=top><small><small>amd64 hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386</small></small></td>
 </tr>
 
 <tr><td colspan=4><hr size=1></td></tr>
 <tr><td colspan=4><big><strong>NC New Caledonia</strong></big></td></tr>
 
 <tr>
-<td valign=top>debian.nautile.nc</td>
-<td valign=top><a href="ftp://debian.nautile.nc/debian/">/debian/</a></td>
-<td valign=top><a href="http://debian.nautile.nc/debian/">/debian/</a></td>
-<td valign=top><small><small>amd64 arm i386</small></small></td>
+<td valign=top>ftp.nc.debian.org<br>  (debian.nautile.nc)</td>
+<td valign=top><a href="ftp://ftp.nc.debian.org/debian/">/debian/</a></td>
+<td valign=top><a href="http://ftp.nc.debian.org/debian/">/debian/</a></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 
 <tr><td colspan=4><hr size=1></td></tr>
@@ -1689,7 +1832,7 @@ Everything else you want to know about Debian mirrors:
 <td valign=top>debian.uni.edu.ni</td>
 <td></td>
 <td valign=top><a href="http://debian.uni.edu.ni/debian/">/debian/</a></td>
-<td valign=top><small><small>amd64 hurd-i386 i386</small></small></td>
+<td valign=top><small><small>amd64 i386</small></small></td>
 </tr>
 
 <tr><td colspan=4><hr size=1></td></tr>
@@ -1699,31 +1842,43 @@ 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 mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 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 mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc</small></small></td>
+</tr>
+<tr>
+<td valign=top>mirrors.nl.kernel.org</td>
+<td valign=top><a href="ftp://mirrors.nl.kernel.org/debian/">/debian/</a></td>
+<td valign=top><a href="http://mirrors.nl.kernel.org/debian/">/debian/</a></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 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 mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 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 mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 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 mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc</small></small></td>
+</tr>
+<tr>
+<td valign=top>debian.mirror.cambrium.nl</td>
+<td valign=top><a href="ftp://debian.mirror.cambrium.nl/debian/">/debian/</a></td>
+<td valign=top><a href="http://debian.mirror.cambrium.nl/debian/">/debian/</a></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 
 <tr><td colspan=4><hr size=1></td></tr>
@@ -1733,7 +1888,7 @@ Everything else you want to know about Debian mirrors:
 <td valign=top>ftp.no.debian.org<br>  (ftp.uninett.no)</td>
 <td valign=top><a href="ftp://ftp.no.debian.org/debian/">/debian/</a></td>
 <td valign=top><a href="http://ftp.no.debian.org/debian/">/debian/</a></td>
-<td valign=top><small><small>amd64 i386 ia64 powerpc sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 
 <tr><td colspan=4><hr size=1></td></tr>
@@ -1743,7 +1898,13 @@ 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 mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 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 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 
 <tr><td colspan=4><hr size=1></td></tr>
@@ -1753,7 +1914,7 @@ Everything else you want to know about Debian mirrors:
 <td valign=top>repository.linux.pf</td>
 <td valign=top><a href="ftp://repository.linux.pf/debian/">/debian/</a></td>
 <td valign=top><a href="http://repository.linux.pf/debian/">/debian/</a></td>
-<td valign=top><small><small>amd64 i386</small></small></td>
+<td valign=top><small><small>amd64 i386 kfreebsd-amd64 kfreebsd-i386</small></small></td>
 </tr>
 
 <tr><td colspan=4><hr size=1></td></tr>
@@ -1763,37 +1924,37 @@ 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 mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 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 powerpc sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 hurd-i386 i386 kfreebsd-amd64 kfreebsd-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 mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>ftp.vectranet.pl</td>
 <td valign=top><a href="ftp://ftp.vectranet.pl/debian/">/debian/</a></td>
 <td valign=top><a href="http://ftp.vectranet.pl/debian/">/debian/</a></td>
-<td valign=top><small><small>amd64 i386</small></small></td>
+<td valign=top><small><small>amd64 i386 kfreebsd-amd64 kfreebsd-i386</small></small></td>
 </tr>
 <tr>
 <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 mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 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 mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>piotrkosoft.net</td>
@@ -1809,43 +1970,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 mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 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 mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 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 mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 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="ftp://mirrors.nfsi.pt/debian/">/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 mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 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 mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top>mirrors.fe.up.pt</td>
+<td valign=top><a href="ftp://mirrors.fe.up.pt/debian/">/debian/</a></td>
+<td valign=top><a href="http://mirrors.fe.up.pt/debian/">/debian/</a></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 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 mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 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 mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>amd64 hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 powerpc sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>debian.dcc.fc.up.pt</td>
@@ -1857,7 +2018,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 mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 
 <tr><td colspan=4><hr size=1></td></tr>
@@ -1867,19 +2028,19 @@ 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 mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>ftp.lug.ro</td>
 <td valign=top><a href="ftp://ftp.lug.ro/debian/">/debian/</a></td>
 <td valign=top><a href="http://ftp.lug.ro/debian/">/debian/</a></td>
-<td valign=top><small><small>amd64 i386 powerpc</small></small></td>
+<td valign=top><small><small>amd64 i386 kfreebsd-amd64 kfreebsd-i386 powerpc</small></small></td>
 </tr>
 <tr>
-<td valign=top>ftp.mikesnet.ro</td>
-<td valign=top><a href="ftp://ftp.mikesnet.ro/debian/">/debian/</a></td>
-<td valign=top><a href="http://ftp.mikesnet.ro/debian/">/debian/</a></td>
-<td valign=top><small><small>amd64 i386 mips mipsel</small></small></td>
+<td valign=top>mirrors.xservers.ro</td>
+<td valign=top><a href="ftp://mirrors.xservers.ro/debian/">/debian/</a></td>
+<td valign=top><a href="http://mirrors.xservers.ro/debian/">/debian/</a></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 
 <tr><td colspan=4><hr size=1></td></tr>
@@ -1889,7 +2050,13 @@ 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 mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 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>
 </tr>
 <tr>
 <td valign=top>ftp.psn.ru</td>
@@ -1907,13 +2074,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 mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 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 mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>ftp.debian.chuvsu.ru</td>
@@ -1921,6 +2088,12 @@ Everything else you want to know about Debian mirrors:
 <td valign=top><a href="http://ftp.debian.chuvsu.ru/debian/">/debian/</a></td>
 <td valign=top><small><small>amd64 i386</small></small></td>
 </tr>
+<tr>
+<td valign=top>mirror2.corbina.ru</td>
+<td valign=top><a href="ftp://mirror2.corbina.ru/debian/">/debian/</a></td>
+<td valign=top><a href="http://mirror2.corbina.ru/debian/">/debian/</a></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc</small></small></td>
+</tr>
 
 <tr><td colspan=4><hr size=1></td></tr>
 <tr><td colspan=4><big><strong>SE Sweden</strong></big></td></tr>
@@ -1929,25 +2102,31 @@ 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 mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 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 armel 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 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc</small></small></td>
+</tr>
+<tr>
+<td valign=top>mirrors.se.kernel.org</td>
+<td valign=top><a href="ftp://mirrors.se.kernel.org/debian/">/debian/</a></td>
+<td valign=top><a href="http://mirrors.se.kernel.org/debian/">/debian/</a></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 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 mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 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/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>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>debian.bsnet.se</td>
@@ -1959,13 +2138,13 @@ Everything else you want to know about Debian mirrors:
 <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 armel 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 kfreebsd-amd64 kfreebsd-i386 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 mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><a href="http://ftp.df.lth.se/debian/">/debian/</a></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 
 <tr><td colspan=4><hr size=1></td></tr>
@@ -1975,29 +2154,23 @@ Everything else you want to know about Debian mirrors:
 <td valign=top>mirror.nus.edu.sg</td>
 <td valign=top><a href="ftp://mirror.nus.edu.sg/pub/Debian/">/pub/Debian/</a></td>
 <td valign=top><a href="http://mirror.nus.edu.sg/Debian/">/Debian/</a></td>
-<td valign=top><small><small>amd64 i386</small></small></td>
+<td valign=top><small><small>amd64 i386 kfreebsd-amd64 kfreebsd-i386</small></small></td>
 </tr>
 
 <tr><td colspan=4><hr size=1></td></tr>
 <tr><td colspan=4><big><strong>SI Slovenia</strong></big></td></tr>
 
 <tr>
-<td valign=top>ftp.si.debian.org<br>  (ftp.camtp.uni-mb.si)</td>
+<td valign=top>ftp.si.debian.org<br>  (debian.prunk.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>amd64 i386 powerpc sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>ftp.arnes.si</td>
 <td valign=top><a href="ftp://ftp.arnes.si/packages/debian/">/packages/debian/</a></td>
 <td valign=top><a href="http://ftp.arnes.si/pub/packages/debian/">/pub/packages/debian/</a></td>
-<td valign=top><small><small>amd64 hurd-i386 i386</small></small></td>
-</tr>
-<tr>
-<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>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>amd64 hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386</small></small></td>
 </tr>
 
 <tr><td colspan=4><hr size=1></td></tr>
@@ -2007,19 +2180,19 @@ Everything else you want to know about Debian mirrors:
 <td valign=top>ftp.sk.debian.org<br>  (ftp.debian.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 mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <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><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><a href="http://debian.ynet.sk/debian/">/debian/</a></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 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 mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 
 <tr><td colspan=4><hr size=1></td></tr>
@@ -2029,39 +2202,51 @@ Everything else you want to know about Debian mirrors:
 <td valign=top>debian.ues.edu.sv</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>
+<td valign=top><small><small>amd64 i386 ia64 kfreebsd-amd64 kfreebsd-i386</small></small></td>
 </tr>
 
 <tr><td colspan=4><hr size=1></td></tr>
 <tr><td colspan=4><big><strong>TH Thailand</strong></big></td></tr>
 
 <tr>
-<td valign=top>ftp.coe.psu.ac.th</td>
-<td valign=top><a href="ftp://ftp.coe.psu.ac.th/debian/">/debian/</a></td>
-<td valign=top><a href="http://ftp.coe.psu.ac.th/debian/">/debian/</a></td>
-<td valign=top><small><small>i386</small></small></td>
+<td valign=top>ftp.th.debian.org<br>  (ftp.coe.psu.ac.th)</td>
+<td valign=top><a href="ftp://ftp.th.debian.org/debian/">/debian/</a></td>
+<td valign=top><a href="http://ftp.th.debian.org/debian/">/debian/</a></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc</small></small></td>
+</tr>
+<tr>
+<td valign=top>ftp.v6.coe.psu.ac.th</td>
+<td valign=top><a href="ftp://ftp.v6.coe.psu.ac.th/debian/">/debian/</a></td>
+<td valign=top><a href="http://ftp.v6.coe.psu.ac.th/debian/">/debian/</a></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>debian.thaios.net</td>
 <td></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>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>ftp.debianclub.org</td>
 <td valign=top><a href="ftp://ftp.debianclub.org/debian/">/debian/</a></td>
 <td valign=top><a href="http://ftp.debianclub.org/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 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc</small></small></td>
+</tr>
+<tr>
+<td valign=top>mirror.kku.ac.th</td>
+<td valign=top><a href="ftp://mirror.kku.ac.th/debian/">/debian/</a></td>
+<td valign=top><a href="http://mirror.kku.ac.th/debian/">/debian/</a></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 
 <tr><td colspan=4><hr size=1></td></tr>
 <tr><td colspan=4><big><strong>TR Turkey</strong></big></td></tr>
 
 <tr>
-<td valign=top>ftp.tr.debian.org<br>  (debian.ankara.edu.tr)</td>
+<td valign=top>ftp.tr.debian.org<br>  (debian.lyildirim.net)</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 armel 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 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>ftp.linux.org.tr</td>
@@ -2070,28 +2255,40 @@ Everything else you want to know about Debian mirrors:
 <td valign=top><small><small>amd64 i386</small></small></td>
 </tr>
 <tr>
-<td valign=top>godel.cs.bilgi.edu.tr</td>
-<td valign=top><a href="ftp://godel.cs.bilgi.edu.tr/debian/">/debian/</a></td>
-<td valign=top><a href="http://godel.cs.bilgi.edu.tr/debian/">/debian/</a></td>
-<td valign=top><small><small>hurd-i386 i386</small></small></td>
+<td valign=top>russell.cs.bilgi.edu.tr</td>
+<td valign=top><a href="ftp://russell.cs.bilgi.edu.tr/debian/">/debian/</a></td>
+<td valign=top><a href="http://russell.cs.bilgi.edu.tr/debian/">/debian/</a></td>
+<td valign=top><small><small>amd64 hurd-i386 i386</small></small></td>
 </tr>
 <tr>
 <td valign=top>debian.eso-es.net</td>
 <td></td>
 <td valign=top><a href="http://debian.eso-es.net/debian/">/debian/</a></td>
-<td valign=top><small><small>amd64 i386 ia64 sparc</small></small></td>
+<td valign=top><small><small>amd64 i386 ia64 kfreebsd-amd64 kfreebsd-i386 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>debian.comu.edu.tr</td>
 <td valign=top><a href="ftp://debian.comu.edu.tr/debian/">/debian/</a></td>
 <td valign=top><a href="http://debian.comu.edu.tr/debian/">/debian/</a></td>
-<td valign=top><small><small>amd64 i386 ia64 powerpc sparc</small></small></td>
+<td valign=top><small><small>amd64 i386 ia64 kfreebsd-amd64 kfreebsd-i386 powerpc sparc</small></small></td>
 </tr>
 <tr>
 <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>alpha amd64 arm armel 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 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc</small></small></td>
+</tr>
+<tr>
+<td valign=top>debian.gnu.gen.tr</td>
+<td valign=top><a href="ftp://debian.gnu.gen.tr/debian/">/debian/</a></td>
+<td valign=top><a href="http://debian.gnu.gen.tr/debian/">/debian/</a></td>
+<td valign=top><small><small>amd64 i386</small></small></td>
+</tr>
+<tr>
+<td valign=top>debian.turkmesh.com.tr</td>
+<td></td>
+<td valign=top><a href="http://debian.turkmesh.com.tr/debian/">/debian/</a></td>
+<td valign=top><small><small>amd64 i386 ia64 kfreebsd-amd64 kfreebsd-i386</small></small></td>
 </tr>
 
 <tr><td colspan=4><hr size=1></td></tr>
@@ -2101,7 +2298,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 mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>debian.csie.ntu.edu.tw</td>
@@ -2113,43 +2310,67 @@ 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 mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 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 mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 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 mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 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 mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 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 mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 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 mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 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/debian/">/debian/</a></td>
+<td valign=top><a href="http://ftp.ncnu.edu.tw/debian/">/debian/</a></td>
+<td valign=top><small><small>amd64 i386 kfreebsd-amd64 kfreebsd-i386 powerpc</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 mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc</small></small></td>
+</tr>
+<tr>
+<td valign=top>ftp.tcc.edu.tw</td>
+<td valign=top><a href="ftp://ftp.tcc.edu.tw/debian/">/debian/</a></td>
+<td valign=top><a href="http://ftp.tcc.edu.tw/debian/">/debian/</a></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc</small></small></td>
+</tr>
+<tr>
+<td valign=top>ftp.tku.edu.tw</td>
+<td valign=top><a href="ftp://ftp.tku.edu.tw/debian/">/debian/</a></td>
+<td valign=top><a href="http://ftp.tku.edu.tw/debian/">/debian/</a></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc</small></small></td>
+</tr>
+<tr>
+<td valign=top>shadow.ind.ntou.edu.tw</td>
+<td valign=top><a href="ftp://shadow.ind.ntou.edu.tw/debian/">/debian/</a></td>
+<td valign=top><a href="http://shadow.ind.ntou.edu.tw/debian/">/debian/</a></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 
 <tr><td colspan=4><hr size=1></td></tr>
@@ -2159,13 +2380,13 @@ Everything else you want to know about Debian mirrors:
 <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>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 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>
+<td valign=top><small><small>i386 kfreebsd-amd64 kfreebsd-i386</small></small></td>
 </tr>
 <tr>
 <td valign=top>ftp.3logic.net</td>
@@ -2183,7 +2404,7 @@ Everything else you want to know about Debian mirrors:
 <td valign=top>ftp2.debian.org.ua</td>
 <td valign=top><a href="ftp://ftp2.debian.org.ua/debian/">/debian/</a></td>
 <td valign=top><a href="http://ftp2.debian.org.ua/debian/">/debian/</a></td>
-<td valign=top><small><small>amd64 i386</small></small></td>
+<td valign=top><small><small>amd64 i386 kfreebsd-amd64 kfreebsd-i386</small></small></td>
 </tr>
 
 <tr><td colspan=4><hr size=1></td></tr>
@@ -2193,67 +2414,61 @@ 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 mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 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 mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 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 mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>distro.ibiblio.org</td>
-<td valign=top><a href="ftp://distro.ibiblio.org/pub/linux/distributions/debian/">/pub/linux/distributions/debian/</a></td>
+<td valign=top><a href="ftp://distro.ibiblio.org/debian/">/debian/</a></td>
 <td valign=top><a href="http://distro.ibiblio.org/debian/">/debian/</a></td>
-<td valign=top><small><small>amd64 i386 ia64</small></small></td>
+<td valign=top><small><small>amd64 i386 ia64 kfreebsd-amd64 kfreebsd-i386</small></small></td>
 </tr>
 <tr>
 <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 mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>mirror.cs.wisc.edu</td>
-<td valign=top><a href="ftp://mirror.cs.wisc.edu/pub/mirrors/linux/debian/">/pub/mirrors/linux/debian/</a></td>
-<td valign=top><a href="http://mirror.cs.wisc.edu/pub/mirrors/linux/debian/">/pub/mirrors/linux/debian/</a></td>
-<td valign=top><small><small>amd64 i386</small></small></td>
+<td valign=top><a href="ftp://mirror.cs.wisc.edu/debian/">/debian/</a></td>
+<td valign=top><a href="http://mirror.cs.wisc.edu/debian/">/debian/</a></td>
+<td valign=top><small><small>amd64 i386 kfreebsd-amd64 kfreebsd-i386</small></small></td>
 </tr>
 <tr>
 <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 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 mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 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 mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 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 mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 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 mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>gladiator.real-time.com</td>
@@ -2265,151 +2480,133 @@ 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 mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>mirrors.xmission.com</td>
 <td valign=top><a href="ftp://mirrors.xmission.com/debian/">/debian/</a></td>
 <td valign=top><a href="http://mirrors.xmission.com/debian/">/debian/</a></td>
-<td valign=top><small><small>amd64 hurd-i386 i386 powerpc sparc</small></small></td>
+<td valign=top><small><small>amd64 hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 powerpc sparc</small></small></td>
+</tr>
+<tr>
+<td valign=top>ftp.keystealth.org</td>
+<td valign=top><a href="ftp://ftp.keystealth.org/debian/">/debian/</a></td>
+<td valign=top><a href="http://ftp.keystealth.org/debian/">/debian/</a></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>ftp.lug.udel.edu</td>
 <td valign=top><a href="ftp://ftp.lug.udel.edu/pub/debian/">/pub/debian/</a></td>
 <td valign=top><a href="http://ftp.lug.udel.edu/pub/debian/">/pub/debian/</a></td>
-<td valign=top><small><small>amd64 hurd-i386 i386 powerpc sparc</small></small></td>
+<td valign=top><small><small>amd64 hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 powerpc sparc</small></small></td>
 </tr>
 <tr>
 <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 mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 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 mips mipsel powerpc s390 sparc</small></small></td>
-</tr>
-<tr>
-<td valign=top>ftp.silug.org</td>
-<td valign=top><a href="ftp://ftp.silug.org/pub/debian/">/pub/debian/</a></td>
-<td valign=top><a href="http://ftp.silug.org/pub/debian/">/pub/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel hppa i386 mips mipsel powerpc sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <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 mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 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 mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 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 mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>sluglug.ucsc.edu</td>
 <td></td>
 <td valign=top><a href="http://sluglug.ucsc.edu/debian/">/debian/</a></td>
-<td valign=top><small><small>amd64 hurd-i386 i386 powerpc sparc</small></small></td>
+<td valign=top><small><small>amd64 i386</small></small></td>
 </tr>
 <tr>
 <td valign=top>mirrors.geeks.org</td>
 <td valign=top><a href="ftp://mirrors.geeks.org/debian/">/debian/</a></td>
 <td valign=top><a href="http://mirrors.geeks.org/debian/">/debian/</a></td>
-<td valign=top><small><small>amd64 i386</small></small></td>
+<td valign=top><small><small>amd64 i386 kfreebsd-amd64 kfreebsd-i386</small></small></td>
 </tr>
 <tr>
 <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 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 mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>lug.mtu.edu</td>
 <td valign=top><a href="ftp://lug.mtu.edu/debian/">/debian/</a></td>
 <td valign=top><a href="http://lug.mtu.edu/debian/">/debian/</a></td>
-<td valign=top><small><small>alpha amd64 hppa i386 mips mipsel powerpc sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 hppa i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc sparc</small></small></td>
 </tr>
 <tr>
 <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 mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>debian.cites.uiuc.edu</td>
 <td valign=top><a href="ftp://debian.cites.uiuc.edu/pub/debian/">/pub/debian/</a></td>
 <td valign=top><a href="http://debian.cites.uiuc.edu/pub/debian/">/pub/debian/</a></td>
-<td valign=top><small><small>amd64 hurd-i386 i386 ia64 powerpc sparc</small></small></td>
+<td valign=top><small><small>amd64 hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 powerpc sparc</small></small></td>
 </tr>
 <tr>
 <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 mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 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 mips mipsel powerpc s390 sparc</small></small></td>
-</tr>
-<tr>
-<td valign=top>cudlug.cudenver.edu</td>
-<td></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>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>mirror.cc.columbia.edu</td>
-<td valign=top><a href="ftp://mirror.cc.columbia.edu/pub/linux/debian/debian/">/pub/linux/debian/debian/</a></td>
-<td valign=top><a href="http://mirror.cc.columbia.edu/pub/linux/debian/debian/">/pub/linux/debian/debian/</a></td>
-<td valign=top><small><small>amd64 i386 powerpc</small></small></td>
+<td valign=top><a href="ftp://mirror.cc.columbia.edu/debian/">/debian/</a></td>
+<td valign=top><a href="http://mirror.cc.columbia.edu/debian/">/debian/</a></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>ftp.grokthis.net</td>
-<td valign=top><a href="ftp://ftp.grokthis.net/mirrors/debian/">/mirrors/debian/</a></td>
-<td></td>
-<td valign=top><small><small>amd64 i386</small></small></td>
+<td valign=top><a href="ftp://ftp.grokthis.net/debian/">/debian/</a></td>
+<td valign=top><a href="http://ftp.grokthis.net/debian/">/debian/</a></td>
+<td valign=top><small><small>amd64 i386 kfreebsd-amd64 kfreebsd-i386</small></small></td>
 </tr>
 <tr>
 <td valign=top>mirrors.xenir.com</td>
 <td></td>
 <td valign=top><a href="http://mirrors.xenir.com/debian/">/debian/</a></td>
-<td valign=top><small><small>amd64 arm armel i386 powerpc</small></small></td>
+<td valign=top><small><small>amd64 arm armel i386 kfreebsd-amd64 kfreebsd-i386 powerpc</small></small></td>
 </tr>
 <tr>
 <td valign=top>debian.mirrors.easynews.com</td>
 <td></td>
 <td valign=top><a href="http://debian.mirrors.easynews.com/linux/debian/">/linux/debian/</a></td>
-<td valign=top><small><small>amd64 i386</small></small></td>
-</tr>
-<tr>
-<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 mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>amd64 i386 kfreebsd-amd64 kfreebsd-i386</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 mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>ftp.uga.edu</td>
@@ -2421,25 +2618,25 @@ Everything else you want to know about Debian mirrors:
 <td valign=top>mirror.steadfast.net</td>
 <td></td>
 <td valign=top><a href="http://mirror.steadfast.net/debian/">/debian/</a></td>
-<td valign=top><small><small>amd64 i386</small></small></td>
+<td valign=top><small><small>amd64 i386 kfreebsd-amd64 kfreebsd-i386</small></small></td>
 </tr>
 <tr>
 <td valign=top>ftp.utexas.edu</td>
-<td valign=top><a href="ftp://ftp.utexas.edu/pub/debian/">/pub/debian/</a></td>
+<td></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 mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>mirror.fdcservers.net</td>
 <td valign=top><a href="ftp://mirror.fdcservers.net/debian/">/debian/</a></td>
 <td valign=top><a href="http://mirror.fdcservers.net/debian/">/debian/</a></td>
-<td valign=top><small><small>amd64 i386</small></small></td>
+<td valign=top><small><small>amd64 i386 kfreebsd-amd64 kfreebsd-i386</small></small></td>
 </tr>
 <tr>
 <td valign=top>mirror.rit.edu</td>
 <td valign=top><a href="ftp://mirror.rit.edu/debian/">/debian/</a></td>
 <td valign=top><a href="http://mirror.rit.edu/debian/">/debian/</a></td>
-<td valign=top><small><small>alpha amd64 arm armel i386 powerpc sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel i386 kfreebsd-amd64 kfreebsd-i386 powerpc sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>debian.corenetworks.net</td>
@@ -2451,19 +2648,55 @@ 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 mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 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 mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 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>
+<td valign=top><small><small>amd64 hppa i386 kfreebsd-amd64 kfreebsd-i386 powerpc</small></small></td>
+</tr>
+<tr>
+<td valign=top>mirrors.hosef.org</td>
+<td valign=top><a href="ftp://mirrors.hosef.org/debian/">/debian/</a></td>
+<td valign=top><a href="http://mirrors.hosef.org/debian/">/debian/</a></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc</small></small></td>
+</tr>
+<tr>
+<td valign=top>mirrors.modwest.com</td>
+<td></td>
+<td valign=top><a href="http://mirrors.modwest.com/debian/">/debian/</a></td>
+<td valign=top><small><small>amd64 i386</small></small></td>
+</tr>
+<tr>
+<td valign=top>mirrors.bloomu.edu</td>
+<td valign=top><a href="ftp://mirrors.bloomu.edu/debian/">/debian/</a></td>
+<td valign=top><a href="http://mirrors.bloomu.edu/debian/">/debian/</a></td>
+<td valign=top><small><small>amd64 i386 kfreebsd-amd64 kfreebsd-i386</small></small></td>
+</tr>
+<tr>
+<td valign=top>debian.usu.edu</td>
+<td></td>
+<td valign=top><a href="http://debian.usu.edu/debian/">/debian/</a></td>
+<td valign=top><small><small>amd64 armel i386 powerpc sparc</small></small></td>
+</tr>
+<tr>
+<td valign=top>debian.securedservers.com</td>
+<td></td>
+<td valign=top><a href="http://debian.securedservers.com/debian/">/debian/</a></td>
+<td valign=top><small><small>amd64 i386</small></small></td>
+</tr>
+<tr>
+<td valign=top>debian.cc.lehigh.edu</td>
+<td></td>
+<td valign=top><a href="http://debian.cc.lehigh.edu/debian/">/debian/</a></td>
+<td valign=top><small><small>amd64 i386</small></small></td>
 </tr>
 
 <tr><td colspan=4><hr size=1></td></tr>
@@ -2473,7 +2706,7 @@ Everything else you want to know about Debian mirrors:
 <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 mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 
 <tr><td colspan=4><hr size=1></td></tr>
@@ -2483,7 +2716,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 mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 
 <tr><td colspan=4><hr size=1></td></tr>
@@ -2493,13 +2726,13 @@ Everything else you want to know about Debian mirrors:
 <td valign=top>ftp.sun.ac.za</td>
 <td valign=top><a href="ftp://ftp.sun.ac.za/debian/">/debian/</a></td>
 <td valign=top><a href="http://ftp.sun.ac.za/ftp/debian/">/ftp/debian/</a></td>
-<td valign=top><small><small>amd64 i386</small></small></td>
+<td valign=top><small><small>amd64 i386 kfreebsd-amd64 kfreebsd-i386</small></small></td>
 </tr>
 <tr>
 <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 mips mipsel powerpc s390 sparc</small></small></td>
+<td valign=top><small><small>alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc</small></small></td>
 </tr>
 <tr>
 <td valign=top>ftp.is.co.za</td>
@@ -2510,8 +2743,8 @@ Everything else you want to know about Debian mirrors:
 </table>
 <hr>
 <table border="0" width="100%"><tr>
-  <td align="left"><small>Last modified: Fri Feb 13 19:52:18 2009</small></td>
-  <td align="right"><small>Number of sites listed: 414</small></td>
+  <td align="left"><small>Last modified: Fri Jan 21 01:52:22 2011</small></td>
+  <td align="right"><small>Number of sites listed: 450</small></td>
 </tr></table>
 </body>
 </html>
diff --git a/includes/squeeze/install/README.mirrors.txt b/includes/squeeze/install/README.mirrors.txt
index 5ab2d75c3..0a4ee0a43 100644
--- a/includes/squeeze/install/README.mirrors.txt
+++ b/includes/squeeze/install/README.mirrors.txt
@@ -37,49 +37,54 @@ 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 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 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 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
+ Austria         ftp.at.debian.org     /debian/        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+ Australia       ftp.au.debian.org     /debian/        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+ Bosnia & Herzegovina  ftp.ba.debian.org     /debian/        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+ Belgium         ftp.be.debian.org     /debian/        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+ Bulgaria        ftp.bg.debian.org     /debian/        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+ Brazil          ftp.br.debian.org     /debian/        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+ Belarus         ftp.by.debian.org     /debian/        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+ Canada          ftp.ca.debian.org     /debian/        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+ Switzerland     ftp.ch.debian.org     /debian/        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+ Chile           ftp.cl.debian.org     /debian/        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+ Czech Republic  ftp.cz.debian.org     /debian/        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+ Germany         ftp.de.debian.org     /debian/        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+ Germany         ftp2.de.debian.org    /debian/        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+ Denmark         ftp.dk.debian.org     /debian/        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+ Estonia         ftp.ee.debian.org     /debian/        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+ Spain           ftp.es.debian.org     /debian/        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+ Finland         ftp.fi.debian.org     /debian/        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+ France          ftp.fr.debian.org     /debian/        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+ France          ftp2.fr.debian.org    /debian/        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+ Great Britain   ftp.uk.debian.org     /debian/        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+ Greece          ftp.gr.debian.org     /debian/        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+ Hong Kong       ftp.hk.debian.org     /debian/        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+ Croatia         ftp.hr.debian.org     /debian/        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+ Hungary         ftp.hu.debian.org     /debian/        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+ Ireland         ftp.ie.debian.org     /debian/        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+ Iceland         ftp.is.debian.org     /debian/        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+ Italy           ftp.it.debian.org     /debian/        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+ Japan           ftp.jp.debian.org     /debian/        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+ Japan           ftp2.jp.debian.org    /debian/        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+ Korea           ftp.kr.debian.org     /debian/        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+ Lithuania       ftp.lt.debian.org     /debian/        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+ Mexico          ftp.mx.debian.org     /debian/        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+ New Caledonia   ftp.nc.debian.org     /debian/        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+ Netherlands     ftp.nl.debian.org     /debian/        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+ Norway          ftp.no.debian.org     /debian/        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+ New Zealand     ftp.nz.debian.org     /debian/        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+ Poland          ftp.pl.debian.org     /debian/        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+ Portugal        ftp.pt.debian.org     /debian/        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+ Romania         ftp.ro.debian.org     /debian/        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+ Russia          ftp.ru.debian.org     /debian/        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+ Sweden          ftp.se.debian.org     /debian/        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+ Slovenia        ftp.si.debian.org     /debian/        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+ Slovakia        ftp.sk.debian.org     /debian/        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+ Thailand        ftp.th.debian.org     /debian/        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+ Turkey          ftp.tr.debian.org     /debian/        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+ Taiwan          ftp.tw.debian.org     /debian/        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+ Ukraine         ftp.ua.debian.org     /debian/        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+ United States   ftp.us.debian.org     /debian/        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
 
 
                    Secondary mirrors of the Debian archive
@@ -90,555 +95,609 @@ HOST NAME                       FTP                             HTTP
 
 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 mips mipsel powerpc s390 sparc
+ftp.ccc.uba.ar                  /pub/linux/debian/debian/       /pub/linux/debian/debian/       amd64 i386 kfreebsd-amd64 kfreebsd-i386
+debian.torredehanoi.org         /debian/                        /debian/                        amd64 arm armel hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 powerpc
 
 AT Austria
 ----------
-ftp.at.debian.org               /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+ftp.at.debian.org               /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 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 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 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
-debian.lagis.at                 /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+gd.tuwien.ac.at                                                 /opsys/linux/debian/            alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+debian.mur.at                   /debian/                        /debian/                        amd64 i386 ia64 kfreebsd-amd64 kfreebsd-i386
+ftp.tu-graz.ac.at               /mirror/debian/                 /mirror/debian/                 alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+ftp.univie.ac.at                /systems/linux/debian/debian/   /systems/linux/debian/debian/   i386 kfreebsd-amd64 kfreebsd-i386
+debian.inode.at                 /debian/                        /debian/                        alpha amd64 arm armel i386 kfreebsd-amd64 kfreebsd-i386 powerpc sparc
+debian.lagis.at                 /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
 
 AU Australia
 ------------
-ftp.au.debian.org               /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+ftp.au.debian.org               /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
   (mirror.linux.org.au)
-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.aarnet.edu.au            /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+ftp.monash.edu.au               /pub/linux/debian/              /pub/linux/debian/              amd64 i386 kfreebsd-amd64 kfreebsd-i386
+ftp.uwa.edu.au                  /debian/                        /debian/                        amd64 i386 kfreebsd-amd64 kfreebsd-i386
 mirror.eftel.com                /debian/                        /debian/                        amd64 i386
-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 mips mipsel powerpc s390 sparc
+mirror.pacific.net.au           /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+ftp.iinet.net.au                /debian/debian/                 /debian/debian/                 alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+mirror.optus.net                /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+mirror.cse.unsw.edu.au          /debian/                        /debian/                        amd64 i386 ia64 kfreebsd-amd64 kfreebsd-i386 powerpc
+ftp.netspace.net.au             /pub/debian/                    /pub/debian/                    alpha amd64 arm armel hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+mirror.waia.asn.au              /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+mirror.transact.net.au          /debian/                        /debian/                        amd64 i386
 
 BA Bosnia & Herzegovina
 -----------------------
-mirror.debian.com.ba            /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
+ftp.ba.debian.org               /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+  (mirror.debian.com.ba)
+
+BD Bangladesh
+-------------
+mirrors.ispros.com.bd           /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
 
 BE Belgium
 ----------
-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 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
+ftp.be.debian.org               /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+  (mirror.be.gbxs.net)
+ftp.easynet.be                  /debian/                        /ftp/debian/                    amd64 armel hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mipsel powerpc sparc
+ftp.belnet.be                   /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+ftp.debian.skynet.be            /debian/                        /ftp/debian/                    alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+mirror.eurid.eu                 /debian/                        /debian/                        amd64 i386
 
 BG Bulgaria
 -----------
-ftp.bg.debian.org               /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+ftp.bg.debian.org               /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 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 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 armel i386
+ftp.uni-sofia.bg                /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+debian.telecoms.bg              /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+debian.mnet.bg                  /debian/                        /debian/                        amd64 i386
+debian.networx-bg.com           /debian/                        /debian/                        amd64 armel i386 kfreebsd-amd64 kfreebsd-i386
+debian.ipacct.com               /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
 
 BR Brazil
 ---------
-ftp.br.debian.org               /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+ftp.br.debian.org               /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 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 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
+download.unesp.br                                               /linux/debian/                  alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+sft.if.usp.br                                                   /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+linorg.usp.br                   /debian/                        /debian/                        i386 kfreebsd-amd64 kfreebsd-i386
 ftp.pucpr.br                    /debian/                                                        amd64 hurd-i386 i386
 debian.las.ic.unicamp.br        /debian/                        /debian/                        amd64 i386 powerpc sparc
-debian.pop-sc.rnp.br                                            /debian/                        amd64 i386
+debian.pop-sc.rnp.br                                            /debian/                        amd64 i386 kfreebsd-amd64 kfreebsd-i386
+debs.ifsul.edu.br               /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
 
 BY Belarus
 ----------
-linux.org.by                                                    /debian/                        amd64 i386
-ftp.mgts.by                     /debian/                        /debian/                        amd64 i386
+ftp.by.debian.org               /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+  (ftp.mgts.by)
+linux.org.by                    /debian/                        /debian/                        amd64 i386
 
 CA Canada
 ---------
-ftp.ca.debian.org               /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+ftp.ca.debian.org               /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
 debian.yorku.ca                                                 /debian/                        amd64 i386
-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 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 mips mipsel powerpc s390 sparc
+ftp3.nrc.ca                     /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+mirror.cpsc.ucalgary.ca         /debian/                        /mirror/debian.org/debian/      alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+mirror.peer1.net                                                /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+debian.mirror.rafal.ca          /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+debian.savoirfairelinux.net     /debian/                        /debian/                        amd64 i386 kfreebsd-amd64 kfreebsd-i386 powerpc
+debian.mirror.iweb.ca           /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+mirror.csclub.uwaterloo.ca      /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+mirror.its.dal.ca               /debian/                        /debian/                        alpha amd64 arm armel hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 sparc
+mirrors.ece.ubc.ca                                              /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
 
 CH Switzerland
 --------------
-ftp.ch.debian.org               /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+ftp.ch.debian.org               /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 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 mips mipsel powerpc s390 sparc
-debian.csg.uzh.ch                                               /debian/                        amd64 i386
+mirror.switch.ch                /mirror/debian/                 /ftp/mirror/debian/             alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+debian.csg.uzh.ch                                               /debian/                        amd64 i386 kfreebsd-amd64 kfreebsd-i386
 
 CL Chile
 --------
-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
+ftp.cl.debian.org               /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+  (debian.netlinux.cl)
 debian.utalca.cl                                                /debian/                        amd64 i386
-mirror.debian.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 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
+mirrors.geekbone.org            /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+www.anheng.com.cn               /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+
+CO Colombia
+-----------
+debian.unal.edu.co              /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+
+CR Costa Rica
+-------------
+mirrors.ucr.ac.cr               /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
 
 CZ Czech Republic
 -----------------
-ftp.cz.debian.org               /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+ftp.cz.debian.org               /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
   (ftp.debian.cz)
-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 armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+debian.sh.cvut.cz               /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+ftp.zcu.cz                      /mirrors/debian/                /mirrors/debian/                amd64 i386 kfreebsd-amd64 kfreebsd-i386
+debian.mirror.web4u.cz          /                               /                               amd64 i386 kfreebsd-amd64 kfreebsd-i386
+ftp.cvut.cz                     /debian/                        /debian/                        amd64 i386 ia64 kfreebsd-amd64 kfreebsd-i386
+debian.ignum.cz                 /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+debian.mirror.dkm.cz            /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+debian.superhosting.cz          /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
 
 DE Germany
 ----------
-ftp.de.debian.org               /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+ftp.de.debian.org               /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 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 mips mipsel powerpc s390 sparc
-  (ftp.rfc822.org)
-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
+ftp2.de.debian.org              /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+ftp.tu-clausthal.de             /pub/linux/debian/              /pub/linux/debian/              alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+ftp.rfc822.org                  /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+debian.uni-duisburg-essen.de    /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+ftp.freenet.de                  /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+ftp.uni-erlangen.de             /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 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 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 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-stud.hs-esslingen.de        /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+ftp.stw-bonn.de                 /debian/                        /debian/                        amd64 i386 kfreebsd-amd64 kfreebsd-i386
+ftp.fu-berlin.de                /pub/unix/linux/mirrors/debian/                                 alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+debian.tu-bs.de                 /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+ftp.uni-koeln.de                /debian/                        /debian/                        alpha amd64 i386 kfreebsd-amd64 kfreebsd-i386 powerpc 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 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 mips mipsel powerpc s390 sparc
-artfiles.org                    /debian/                        /debian/                        amd64 i386
-debian.intergenia.de                                            /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 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+ftp.uni-kl.de                   /debian/                        /debian/                        amd64 i386 ia64 kfreebsd-amd64 kfreebsd-i386 powerpc sparc
+ftp.uni-bayreuth.de             /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+ftp.informatik.hu-berlin.de     /pub/Linux/debian/                                              alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 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 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+ftp.hosteurope.de               /pub/linux/debian/              /pub/linux/debian/              alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+ftp.informatik.uni-frankfurt.de /pub/Mirrors/debian.org/debian/ /debian/                        amd64 i386 ia64 kfreebsd-amd64 kfreebsd-i386 powerpc
+debian.netcologne.de            /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+artfiles.org                    /debian/                        /debian/                        amd64 i386 kfreebsd-amd64 kfreebsd-i386
+debian.intergenia.de                                            /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
 debian.cruisix.net              /debian/                        /debian/                        amd64 i386 powerpc
 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 mips mipsel powerpc s390 sparc
-mirror.ayous.org                /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+debian.charite.de                                               /debian/                        i386 kfreebsd-amd64 kfreebsd-i386
+ftp.plusline.de                 /pub/debian/                    /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+mirror.ayous.org                /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+ftp.halifax.rwth-aachen.de      /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+debian.morphium.info            /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+mirror.unitedcolo.de            /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+mirror.1und1.de                 /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
 
 DK Denmark
 ----------
-ftp.dk.debian.org               /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+ftp.dk.debian.org               /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
   (mirrors.dotsrc.org)
-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 armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+mirrors.rackhosting.com         /debian/                        /debian/                        amd64 i386 ia64 kfreebsd-amd64 kfreebsd-i386 sparc
+
+DZ Algeria
+----------
+debian.usthb.dz                 /debian/                        /debian/                        i386
 
 EE Estonia
 ----------
-ftp.ee.debian.org               /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+ftp.ee.debian.org               /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 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 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/                        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
-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/                        alpha amd64 arm armel hppa i386 ia64 mips mipsel powerpc s390 sparc
+ftp.es.debian.org               /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+  (ulises.hostalia.com)
+ftp.rediris.es                  /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+ftp.cica.es                     /debian/                        /debian/                        amd64 i386 ia64 kfreebsd-amd64 kfreebsd-i386 powerpc
+ftp.caliu.cat                   /debian/                        /debian/                        amd64 armel i386 ia64 kfreebsd-amd64 kfreebsd-i386 powerpc
+ftp.gva.es                      /mirror/debian/                 /mirror/debian/                 alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+ftp.gul.uc3m.es                 /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+ftp.udc.es                      /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+debian.grn.cat                  /debian/                        /debian/                        amd64 i386 ia64 kfreebsd-amd64 kfreebsd-i386 powerpc
 
 FI Finland
 ----------
-ftp.fi.debian.org               /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+ftp.fi.debian.org               /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 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 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 kfreebsd-amd64 kfreebsd-i386 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 mips mipsel powerpc s390 sparc
+ftp.fr.debian.org               /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
   (debian.proxad.net)
-ftp2.fr.debian.org              /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+ftp2.fr.debian.org              /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
   (ftp.oleane.net)
-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 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 mips mipsel powerpc s390 sparc
-mir2.ovh.net                                                    /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+ftp.iut-bm.univ-fcomte.fr       /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+debian.polytech-lille.fr        /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+ftp.proxad.net                  /mirrors/ftp.debian.org/                                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+ftp.lip6.fr                     /pub/linux/distributions/debian//pub/linux/distributions/debian/amd64 i386 kfreebsd-amd64 kfreebsd-i386
+debian.ens-cachan.fr            /debian/                        /ftp/debian/                    alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+ftp.u-picardie.fr               /mirror/debian/                 /mirror/debian/                 alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+debian.mirrors.easynet.fr       /debian/                        /                               alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+ftp.u-strasbg.fr                /debian/                        /debian/                        alpha amd64 armel hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 powerpc sparc
+debian.cict.fr                  /debian/                        /debian/                        amd64 arm armel hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386
+mirror.ovh.net                  /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 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 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 mips mipsel powerpc s390 sparc
+ftp.crihan.fr                   /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+debian.mines.inpl-nancy.fr      /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+ftp.debian.ikoula.com           /debian/                                                        amd64 i386 kfreebsd-amd64 kfreebsd-i386
+webb.ens-cachan.fr              /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+mirrors.ircam.fr                /pub/debian/                    /pub/debian/                    alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+debian.mirror.inra.fr           /debian/                        /debian/                        amd64 arm armel i386 ia64 kfreebsd-amd64 kfreebsd-i386 powerpc sparc
+debian.med.univ-tours.fr        /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 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 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
+ftp.univ-nantes.fr              /debian/                                                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+mirrors.compuscene.org                                          /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+debian.revolsys.fr              /debian/                        /debian/                        amd64 i386 kfreebsd-amd64 kfreebsd-i386 powerpc
+debian.univ-reims.fr            /debian/                        /debian/                        amd64 i386 kfreebsd-amd64 kfreebsd-i386
+debian.advalem.net              /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+ftp.ec-m.fr                     /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+deb-mir1.naitways.net                                           /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
 
 GB Great Britain
 ----------------
-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/                        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
+ftp.uk.debian.org               /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+  (free.hands.com)
+debian.man.ac.uk                                                /debian/                        amd64 hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386
+www.mirrorservice.org                                           /sites/ftp.debian.org/debian/   alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+ftp.mirrorservice.org           /sites/ftp.debian.org/debian/                                   alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+ftp.ticklers.org                /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+mirror.positive-internet.com    /debian/                        /debian/                        amd64 hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 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 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
-----------
-ftp.ifg.gtu.ge                  /debian/                                                        amd64 i386
+ukdebian.mirror.anlx.net        /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+mirror.ox.ac.uk                 /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+mirrors.melbourne.co.uk         /debian/                        /debian/                        amd64 hurd-i386 i386
+mirror.bytemark.co.uk           /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
 
 GR Greece
 ---------
-ftp.gr.debian.org               /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+ftp.gr.debian.org               /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
   (ftp.ntua.gr)
-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
+debian.otenet.gr                /pub/linux/debian/              /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+ftp.cc.uoc.gr                   /mirrors/linux/debian/          /mirrors/linux/debian/          alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+postmortem.csd.auth.gr                                          /debian/                        amd64 i386
+ftp.uoi.gr                      /debian/                        /debian/                        amd64 hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 powerpc
 
 HK Hong Kong
 ------------
-ftp.hk.debian.org               /debian/                        /debian/                        alpha amd64 arm armel i386 ia64 powerpc sparc
+ftp.hk.debian.org               /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
 
 HR Croatia
 ----------
-ftp.hr.debian.org               /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+ftp.hr.debian.org               /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
   (debian.carnet.hr)
 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
+ftp.carnet.hr                   /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+debian.iskon.hr                 /debian/                        /debian/                        amd64 hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 s390
 
 HU Hungary
 ----------
-ftp.hu.debian.org               /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+ftp.hu.debian.org               /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
   (ftp.fsn.hu)
-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 mips mipsel powerpc s390 sparc
-debian.sth.sze.hu               /debian/                        /                               amd64 i386 ia64
+ftp.kfki.hu                     /pub/linux/debian/              /linux/debian/                  alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+ftp.bme.hu                      /debian/                        /debian/                        amd64 i386
+debian.mirrors.crysys.hu        /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+debian.sth.sze.hu               /debian/                        /debian/                        amd64 i386 ia64
 
 ID Indonesia
 ------------
 kebo.vlsm.org                   /debian/                        /debian/                        amd64 hurd-i386 i386 powerpc
-mirror.unej.ac.id               /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
+kambing.ui.ac.id                /debian/                        /debian/                        amd64 i386 ia64 sparc
 
 IE Ireland
 ----------
-ftp.ie.debian.org               /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+ftp.ie.debian.org               /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 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 mips mipsel powerpc s390 sparc
+ftp.esat.net                    /pub/linux/debian/              /pub/linux/debian/              alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
 
 IL Israel
 ---------
-debian.co.il                                                    /debian/                        i386
+debian.co.il                                                    /debian/                        amd64 i386 kfreebsd-amd64 kfreebsd-i386
 mirror.isoc.org.il                                              /pub/debian/                    amd64 i386
 
 IN India
 --------
-ftp.iitm.ac.in                  /debian/                        /debian/                        amd64 i386
+ftp.iitm.ac.in                  /debian/                        /debian/                        amd64 i386 kfreebsd-amd64 kfreebsd-i386
+mirror.cse.iitk.ac.in           /debian/                        /debian/                        amd64 i386
 
 IS Iceland
 ----------
-ftp.is.debian.org               /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+ftp.is.debian.org               /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
   (ftp.rhnet.is)
+debian.simnet.is                /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
 
 IT Italy
 --------
-ftp.it.debian.org               /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+ftp.it.debian.org               /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 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 mips mipsel powerpc s390 sparc
 freedom.dicea.unifi.it          /pub/linux/debian/              /ftp/pub/linux/debian/          amd64 hurd-i386 i386
-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
+mi.mirror.garr.it               /mirrors/debian/                /mirrors/debian/                alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+debian.fastweb.it               /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 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/                        amd64 i386
+mirror.units.it                                                 /debian/                        amd64 i386 kfreebsd-amd64 kfreebsd-i386
+debian.bononia.it               /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
 
 JP Japan
 --------
-ftp2.jp.debian.org              /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+ftp2.jp.debian.org              /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
   (ftp.debian.or.jp)
-ftp.jp.debian.org                                               /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+ftp.jp.debian.org               /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 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 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 mips mipsel powerpc s390 sparc
-debian.shimpinomori.net                                         /debian/                        amd64 i386 powerpc
-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 mips mipsel powerpc s390 sparc
+ftp.nara.wide.ad.jp             /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+ftp.dti.ad.jp                   /pub/Linux/debian/              /pub/Linux/debian/              alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+dennou-k.gfd-dennou.org         /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+dennou-q.gfd-dennou.org         /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+ftp.yz.yamagata-u.ac.jp         /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+ftp.riken.jp                    /Linux/debian/debian/           /Linux/debian/debian/           alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+ftp.jaist.ac.jp                 /pub/Linux/Debian/              /pub/Linux/Debian/              alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+www.cohsoft.com                                                 /debian/                        amd64 hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 powerpc
+dennou-h.gfd-dennou.org         /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
 
 KR Korea
 --------
-ftp.kr.debian.org               /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+ftp.kr.debian.org               /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
   (ftp.kaist.ac.kr)
-ftp.daum.net                    /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+ftp.daum.net                    /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+
+KR Korea (South)
+----------------
+ftp.lecl.net                    /debian/                        /debian/                        amd64 i386 sparc
+
+KZ Kazakhstan
+-------------
+mirror.neolabs.kz               /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
 
 LT Lithuania
 ------------
-ftp.litnet.lt                   /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
+ftp.lt.debian.org               /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+ftp.litnet.lt                   /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
 debian.balt.net                 /debian/                        /debian/                        amd64 arm armel i386 sparc
+debian.mirror.vu.lt             /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+
+LU Luxembourg
+-------------
+debian.mirror.root.lu           /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
 
 LV Latvia
 ---------
-koyanet.lv                      /debian/                        /debian/                        amd64 i386
+debian.koyanet.lv               /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+debian.linux.edu.lv             /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+
+MD Moldova
+----------
+debian.md                       /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
 
 MT Malta
 --------
-debian.eng.um.edu.mt                                            /debian/                        amd64 i386
+debian.res.um.edu.mt                                            /debian/                        amd64 i386
 
 MX Mexico
 ---------
-ftp.mx.debian.org               /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+ftp.mx.debian.org               /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
   (debian.unam.mx)
-mmc.geofisica.unam.mx           /debian/                        /debian/                        amd64 hurd-i386 i386 ia64
+mmc.geofisica.unam.mx           /debian/                        /debian/                        amd64 hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386
 
 NC New Caledonia
 ----------------
-debian.nautile.nc               /debian/                        /debian/                        amd64 arm i386
+ftp.nc.debian.org               /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+  (debian.nautile.nc)
 
 NI Nicaragua
 ------------
-debian.uni.edu.ni                                               /debian/                        amd64 hurd-i386 i386
+debian.uni.edu.ni                                               /debian/                        amd64 i386
 
 NL Netherlands
 --------------
-ftp.nl.debian.org               /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+ftp.nl.debian.org               /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 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 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
+ftp.nluug.nl                    /pub/os/Linux/distr/debian/     /pub/os/Linux/distr/debian/     alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+mirrors.nl.kernel.org           /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 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 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+ftp.debian.nl                   /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+ftp.tiscali.nl                  /pub/mirrors/debian/            /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+debian.mirror.cambrium.nl       /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
 
 NO Norway
 ---------
-ftp.no.debian.org               /debian/                        /debian/                        amd64 i386 ia64 powerpc sparc
+ftp.no.debian.org               /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
   (ftp.uninett.no)
 
 NZ New Zealand
 --------------
-ftp.nz.debian.org               /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+ftp.nz.debian.org               /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
   (ftp.citylink.co.nz)
+debian.ihug.co.nz               /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
 
 PF French Polynesia
 -------------------
-repository.linux.pf             /debian/                        /debian/                        amd64 i386
+repository.linux.pf             /debian/                        /debian/                        amd64 i386 kfreebsd-amd64 kfreebsd-i386
 
 PL Poland
 ---------
-ftp.pl.debian.org               /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+ftp.pl.debian.org               /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
   (ftp.task.gda.pl)
-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 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
+ftp.icm.edu.pl                  /pub/Linux/debian/              /pub/Linux/debian/              alpha amd64 hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 powerpc sparc
+ftp.man.szczecin.pl             /pub/Linux/debian/                                              alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+ftp.vectranet.pl                /debian/                        /debian/                        amd64 i386 kfreebsd-amd64 kfreebsd-i386
+ftp.pwr.wroc.pl                 /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 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 kfreebsd-amd64 kfreebsd-i386 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 mips mipsel powerpc s390 sparc
+ftp.pt.debian.org               /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 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 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
+ftp.eq.uc.pt                    /pub/software/Linux/debian/     /software/Linux/debian/         alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+debian.ua.pt                    /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+mirrors.nfsi.pt                 /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+mirrors.fe.up.pt                /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+cesium.di.uminho.pt             /pub/debian/                    /pub/debian/                    alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+debian.netvisao.pt              /debian/                        /                               amd64 hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 powerpc 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 mips mipsel powerpc s390 sparc
+mirror.sim.ul.pt                /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
 
 RO Romania
 ----------
-ftp.ro.debian.org               /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+ftp.ro.debian.org               /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 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
+ftp.lug.ro                      /debian/                        /debian/                        amd64 i386 kfreebsd-amd64 kfreebsd-i386 powerpc
+mirrors.xservers.ro             /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
 
 RU Russia
 ---------
-ftp.ru.debian.org               /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+ftp.ru.debian.org               /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 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 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.mipt.ru                     /debian/                                                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+mirror.yandex.ru                /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
 ftp.debian.chuvsu.ru            /debian/                        /debian/                        amd64 i386
+mirror2.corbina.ru              /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
 
 SE Sweden
 ---------
-ftp.se.debian.org               /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+ftp.se.debian.org               /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
   (ftp.acc.umu.se)
-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
+ftp.sunet.se                    /pub/Linux/distributions/debian//pub/Linux/distributions/debian/alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+mirrors.se.kernel.org           /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+ftp.port80.se                   /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+ftp.ds.karen.hj.se              /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 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
+debian.lth.se                   /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+ftp.df.lth.se                   /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
 
 SG Singapore
 ------------
-mirror.nus.edu.sg               /pub/Debian/                    /Debian/                        amd64 i386
+mirror.nus.edu.sg               /pub/Debian/                    /Debian/                        amd64 i386 kfreebsd-amd64 kfreebsd-i386
 
 SI Slovenia
 -----------
-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/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+ftp.si.debian.org               /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+  (debian.prunk.si)
+ftp.arnes.si                    /packages/debian/               /pub/packages/debian/           amd64 hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386
 
 SK Slovakia
 -----------
-ftp.sk.debian.org               /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+ftp.sk.debian.org               /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
   (ftp.debian.sk)
-debian.ynet.sk                  /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
+debian.ynet.sk                  /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+ftp.antik.sk                    /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
 
 SV El Salvador
 --------------
-debian.ues.edu.sv                                               /debian/                        amd64 i386 ia64
+debian.ues.edu.sv                                               /debian/                        amd64 i386 ia64 kfreebsd-amd64 kfreebsd-i386
 
 TH Thailand
 -----------
-ftp.coe.psu.ac.th               /debian/                        /debian/                        i386
-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
+ftp.th.debian.org               /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+  (ftp.coe.psu.ac.th)
+ftp.v6.coe.psu.ac.th            /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+debian.thaios.net                                               /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+ftp.debianclub.org              /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+mirror.kku.ac.th                /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
 
 TR Turkey
 ---------
-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.tr.debian.org               /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+  (debian.lyildirim.net)
 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/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+russell.cs.bilgi.edu.tr         /debian/                        /debian/                        amd64 hurd-i386 i386
+debian.eso-es.net                                               /debian/                        amd64 i386 ia64 kfreebsd-amd64 kfreebsd-i386 sparc
+debian.comu.edu.tr              /debian/                        /debian/                        amd64 i386 ia64 kfreebsd-amd64 kfreebsd-i386 powerpc sparc
+ftp.metu.edu.tr                 /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+debian.gnu.gen.tr               /debian/                        /debian/                        amd64 i386
+debian.turkmesh.com.tr                                          /debian/                        amd64 i386 ia64 kfreebsd-amd64 kfreebsd-i386
 
 TW Taiwan
 ---------
-ftp.tw.debian.org               /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+ftp.tw.debian.org               /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 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 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
+ftp.twaren.net                  /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+opensource.nchc.org.tw          /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+ftp.isu.edu.tw                  /debian/                        /debian/                        alpha amd64 arm armel hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+debian.nctu.edu.tw              /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+mirror.nttu.edu.tw              /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+debian.csie.nctu.edu.tw         /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+ftp.ncnu.edu.tw                 /debian/                        /debian/                        amd64 i386 kfreebsd-amd64 kfreebsd-i386 powerpc
+ftp.cse.yzu.edu.tw              /pub/Linux/debian/debian/       /pub/Linux/debian/debian/       alpha amd64 arm armel hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+ftp.tcc.edu.tw                  /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+ftp.tku.edu.tw                  /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+shadow.ind.ntou.edu.tw          /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 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
+ftp.ua.debian.org               /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
   (debian.org.ua)
-debian.osdn.org.ua              /pub/Debian/debian/             /debian/                        i386
+debian.osdn.org.ua              /pub/Debian/debian/             /debian/                        i386 kfreebsd-amd64 kfreebsd-i386
 ftp.3logic.net                  /debian/                                                        amd64 i386
 mirror.mirohost.net             /debian/                        /debian/                        amd64 i386
-ftp2.debian.org.ua              /debian/                        /debian/                        amd64 i386
+ftp2.debian.org.ua              /debian/                        /debian/                        amd64 i386 kfreebsd-amd64 kfreebsd-i386
 
 US United States
 ----------------
-ftp.us.debian.org               /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+ftp.us.debian.org               /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 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 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 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 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
+ftp.gtlib.gatech.edu            /pub/debian/                    /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+ftp.egr.msu.edu                 /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+distro.ibiblio.org              /debian/                        /debian/                        amd64 i386 ia64 kfreebsd-amd64 kfreebsd-i386
+ftp-mirror.internap.com         /pub/debian/                    /pub/debian/                    alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+mirror.cs.wisc.edu              /debian/                        /debian/                        amd64 i386 kfreebsd-amd64 kfreebsd-i386
+ftp.uwsg.indiana.edu            /linux/debian/                  /linux/debian/                  alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+ftp.ndlug.nd.edu                /debian/                        /mirrors/debian/                alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+debian.uchicago.edu             /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 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 kfreebsd-amd64 kfreebsd-i386 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 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 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 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 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 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 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 mips mipsel powerpc s390 sparc
-mirrors.acm.jhu.edu                                             /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+mirrors.kernel.org              /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+mirrors.xmission.com            /debian/                        /debian/                        amd64 hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 powerpc sparc
+ftp.keystealth.org              /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+ftp.lug.udel.edu                /pub/debian/                    /pub/debian/                    amd64 hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 powerpc sparc
+debian.lcs.mit.edu              /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+linux.csua.berkeley.edu                                         /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+debian.secsup.org               /pub/linux/debian/              /                               alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+debian.osuosl.org               /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+mirror.anl.gov                  /pub/debian/                    /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+sluglug.ucsc.edu                                                /debian/                        amd64 i386
+mirrors.geeks.org               /debian/                        /debian/                        amd64 i386 kfreebsd-amd64 kfreebsd-i386
+mirrors.usc.edu                 /pub/linux/distributions/debian//pub/linux/distributions/debian/alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+lug.mtu.edu                     /debian/                        /debian/                        alpha amd64 hppa i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc sparc
+debian.mirrors.tds.net          /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+debian.cites.uiuc.edu           /pub/debian/                    /pub/debian/                    amd64 hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 powerpc sparc
+mirrors.tummy.com               /debian/                        /debian/                        alpha amd64 arm hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+debian.mirror.frontiernet.net   /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+mirror.cc.columbia.edu          /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+ftp.grokthis.net                /debian/                        /debian/                        amd64 i386 kfreebsd-amd64 kfreebsd-i386
+mirrors.xenir.com                                               /debian/                        amd64 arm armel i386 kfreebsd-amd64 kfreebsd-i386 powerpc
+debian.mirrors.easynews.com                                     /linux/debian/                  amd64 i386 kfreebsd-amd64 kfreebsd-i386
+mirrors.acm.jhu.edu                                             /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 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 mips mipsel powerpc s390 sparc
-mirror.fdcservers.net           /debian/                        /debian/                        amd64 i386
-mirror.rit.edu                  /debian/                        /debian/                        alpha amd64 arm armel i386 powerpc sparc
+mirror.steadfast.net                                            /debian/                        amd64 i386 kfreebsd-amd64 kfreebsd-i386
+ftp.utexas.edu                                                  /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+mirror.fdcservers.net           /debian/                        /debian/                        amd64 i386 kfreebsd-amd64 kfreebsd-i386
+mirror.rit.edu                  /debian/                        /debian/                        alpha amd64 arm armel i386 kfreebsd-amd64 kfreebsd-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 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
+mirror.its.uidaho.edu           /debian/                        /pub/debian/                    alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+debian.cs.binghamton.edu        /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+mirror.hmc.edu                                                  /debian/                        amd64 hppa i386 kfreebsd-amd64 kfreebsd-i386 powerpc
+mirrors.hosef.org               /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+mirrors.modwest.com                                             /debian/                        amd64 i386
+mirrors.bloomu.edu              /debian/                        /debian/                        amd64 i386 kfreebsd-amd64 kfreebsd-i386
+debian.usu.edu                                                  /debian/                        amd64 armel i386 powerpc sparc
+debian.securedservers.com                                       /debian/                        amd64 i386
+debian.cc.lehigh.edu                                            /debian/                        amd64 i386
 
 UZ Uzbekistan
 -------------
-debian.stream.uz                /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+debian.stream.uz                /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
 
 VE Venezuela
 ------------
-debian.unesr.edu.ve                                             /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+debian.unesr.edu.ve                                             /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 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 mips mipsel powerpc s390 sparc
+ftp.sun.ac.za                   /debian/                        /ftp/debian/                    amd64 i386 kfreebsd-amd64 kfreebsd-i386
+debian.mirror.ac.za             /debian/                        /debian/                        alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 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: Fri Feb 13 19:52:18 2009             Number of sites listed: 414
+Last modified: Fri Jan 21 01:52:22 2011             Number of sites listed: 450
diff --git a/includes/squeeze/install/README.source b/includes/squeeze/install/README.source
new file mode 100644
index 000000000..fb13f0faa
--- /dev/null
+++ b/includes/squeeze/install/README.source
@@ -0,0 +1,11 @@
+Creation of this disk image included extracting files from some Debian
+packages. In case you do not have those packages already, both the
+binary and source packages are archived at
+
+http://cdimage.debian.org/cdimage/cd-sources/
+
+The following binary/source packages were used:
+syslinux-common_4.02+dfsg-7_all.deb
+syslinux_4.02+dfsg-7.dsc
+syslinux_4.02+dfsg-7.diff.gz
+syslinux_4.02+dfsg.orig.tar.gz
diff --git a/includes/squeeze/install/README.txt b/includes/squeeze/install/README.txt
index d4bfc2816..4e0f6902c 100644
--- a/includes/squeeze/install/README.txt
+++ b/includes/squeeze/install/README.txt
@@ -1,16 +1,15 @@
+     Debian GNU/Linux squeeze-di-rc2 "Squeeze" - Official Snapshot i386

+                       NETINST Binary-1 20110121-20:12

 

-      Debian GNU/Linux 5.0.0 "Lenny" - Official i386 NETINST Binary-1

-                               20090214-14:36

-

-                                            (HTML version in README.html)

+                                             (HTML version in README.html)

 

                       Welcome to the exciting world of

                               Debian GNU/Linux

 

-   This disc contains the installer for the Debian GNU/Linux

-   distribution. Debian is a very extensive collection of software. But

-   it is more. It is a complete Operating System (OS) for your computer.

-   And it is free (as in "freedom").

+   This disc contains the installer for the Debian GNU/Linux distribution.

+   Debian is a very extensive collection of software. But it is more. It

+   is a complete Operating System (OS) for your computer. And it is free

+   (as in "freedom").

 

    CONTENTS:

      * Introduction

@@ -48,8 +47,8 @@ About This Disc
 

    This disc is labeled

 

-      Debian GNU/Linux 5.0.0 "Lenny" - Official i386 NETINST Binary-1

-                               20090214-14:36

+     Debian GNU/Linux squeeze-di-rc2 "Squeeze" - Official Snapshot i386

+                       NETINST Binary-1 20110121-20:12

 

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

 

@@ -57,8 +56,6 @@ About This Disc
    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.

-

 Installing

 ==========

 

@@ -66,8 +63,10 @@ Installing
    procedure may seem a bit unusual. You can install Debian GNU/Linux

    either alongside your current OS, or as the only OS on your computer.

 

-   An Installation Guide for this disc is available from the Debian web

-   site.

+   As this is not an official squeeze release disc, then the installation

+   guide many not be released yet. It will appear on the Debian web site

+   when ready, but before then you could try the development version of

+   the manual.

 

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

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

@@ -80,9 +79,9 @@ Last-Minute Notes
 =================

 

      * 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

+       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

@@ -140,5 +139,5 @@ More Information
 

 

 

-      See the Debian contact page (http://www.debian.org/contact) for

-                       information on contacting us.

+       See the Debian contact page (http://www.debian.org/contact) for

+                        information on contacting us.