diff -Nru choose-mirror-2.37/debian/changelog choose-mirror-2.37+squeeze1/debian/changelog
--- choose-mirror-2.37/debian/changelog	2010-12-24 22:33:11.000000000 +0100
+++ choose-mirror-2.37+squeeze1/debian/changelog	2012-12-22 01:12:38.000000000 +0100
@@ -1,3 +1,13 @@
+choose-mirror (2.37+squeeze1) squeeze; urgency=low
+
+  [ Tollef Fog Heen ]
+  * Update URL for master mirror list.
+
+  [ Cyril Brulebois ]
+  * Backport the above change from 2.39 to fix FTBFS. Closes: #695851
+
+ -- Cyril Brulebois <kibi@debian.org>  Sat, 22 Dec 2012 01:09:59 +0100
+
 choose-mirror (2.37) unstable; urgency=low
 
   [ Christian Perrier ]
diff -Nru choose-mirror-2.37/Makefile choose-mirror-2.37+squeeze1/Makefile
--- choose-mirror-2.37/Makefile	2010-02-11 21:01:30.000000000 +0100
+++ choose-mirror-2.37+squeeze1/Makefile	2012-12-22 01:08:31.000000000 +0100
@@ -27,7 +27,7 @@
 LIBS=-ldebconfclient -ldebian-installer
 
 # Derivative distributions may want to change these.
-MIRRORLISTURL=http://cvs.debian.org/*checkout*/webwml/english/mirror/Mirrors.masterlist?rev=HEAD&cvsroot=webwml&content-type=text/plain
+MIRRORLISTURL=http://anonscm.debian.org/viewvc/webwml/webwml/english/mirror/Mirrors.masterlist?revision=HEAD
 MASTERLIST=Mirrors.masterlist
 
 ifdef DEBUG
diff -Nru choose-mirror-2.37/Mirrors.masterlist choose-mirror-2.37+squeeze1/Mirrors.masterlist
--- choose-mirror-2.37/Mirrors.masterlist	2010-12-24 22:33:15.000000000 +0100
+++ choose-mirror-2.37+squeeze1/Mirrors.masterlist	2012-12-22 01:13:16.000000000 +0100
@@ -18,18 +18,18 @@
 
 Site: security.debian.org
 Type: GeoDNS
-Security-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Security-architecture: amd64 armel hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
 Security-ftp: /debian-security/
 Security-http: /debian-security/
 IPv6: yes
 Security-upstream: security-master.debian.org
 Comment: Automatically selects geographically close mirror
  of security update archive.
- Details: https://db.debian.org/git/dsa-geodomains.git/
+ Details: http://dns.debian.org/git/dsa-geodomains.git/
 
 Site: cdn.debian.net
 Type: GeoDNS
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-http: /debian/
 Archive-upstream: ftp-master.debian.org
 IPv6: no
@@ -40,9 +40,9 @@
 
 Site: ftp.us.debian.org
 Alias: http.us.debian.org
-Includes: ftp.egr.msu.edu mirrors.kernel.org debian.osuosl.org debian.lcs.mit.edu
+Includes: ftp.egr.msu.edu mirrors.kernel.org debian.osuosl.org debian.lcs.mit.edu mirror.mycre.ws debian.gtisc.gatech.edu
 Type: Push-Primary
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-http: /debian/
 Archive-ftp: /debian/
 Archive-rsync: debian/
@@ -76,6 +76,14 @@
 Sponsor: XS4ALL http://www.xs4all.nl/
 IPv6: no
 
+Site: www.gluck.debian.org
+Type: Push-Primary
+WWW-http: /
+WWW-upstream: www-master.debian.org
+Maintainer: mirrors@debian.org
+Country: AU Australia
+IPv6: no
+
 Site: senfl.debian.org
 Type: Push-Primary
 WWW-http: /
@@ -88,12 +96,37 @@
 WWW-http: /
 Country: CA Canada
 Sponsor: UBC Electrical and Computer Engineering http://www.ece.ubc.ca/
+IPv6: yes
+
+Site: englund.debian.org
+Type: Push-Primary
+WWW-http: /
+Country: AT Austria
+Location: Vienna
+Sponsor: Silver Server http://www.sil.at/
+IPv6: yes
+
+Site: kokkonen.debian.org
+Type: Push-Primary
+WWW-http: /
+Country: DE Germany
+Location: Darmstadt
+Sponsor: Metropolitan Area Network Darmstadt http://www.man-da.de/
+Sponsor: Nordic Gaming http://www.nordicgaming.com/
+IPv6: no
+
+Site: santoro.debian.org
+Type: Push-Primary
+WWW-http: /
+Country: BR Brazil
+Location: Curitiba
+Sponsor: C3SL, Universidade Federal do Paraná http://www.c3sl.ufpr.br/
 IPv6: no
 
 Site: syncproxy.wna.debian.org
 Type: Push-Primary
 Alias: rietz.debian.org
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 X-Archive-rsync: debian/
 Archive-upstream: ftp-master.debian.org
 Archive-method: push
@@ -101,10 +134,20 @@
 Sponsor: OSU Open Source Lab http://www.osuosl.org/
 IPv6: no
 
+Site: syncproxy.eu.debian.org
+Type: Push-Primary
+Includes: debian.carnet.hr
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
+X-Archive-rsync: debian/
+Archive-upstream: klecker.debian.org
+Archive-method: push
+Country: HR Croatia
+IPv6: yes
+
 Site: syncproxy3.eu.debian.org
 Type: Push-Primary
 Alias: merikanto.debian.org
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 X-Archive-rsync: debian/
 Archive-upstream: kassia.debian.org
 Archive-method: push
@@ -138,15 +181,27 @@
 IPv6: yes
 
 Site: ftp.uk.debian.org
-Alias: free.hands.com
+Includes: free.hands.com
+Type: Push-Primary
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
+Archive-ftp: /debian/
+Archive-http: /debian/
+Archive-rsync: debian/
+Archive-upstream: syncproxy.eu.debian.org
+Archive-method: push
+Country: GB United Kingdom
+IPv6: yes
+
+Site: free.hands.com
 Alias: debian.hands.com
 Alias: open.hands.com
 Type: Push-Primary
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-ftp: /debian/
 Archive-http: /debian/
 Archive-rsync: debian/
 Archive-upstream: syncproxy.eu.debian.org
+Archive-method: push
 Backports-ftp: /debian-backports/
 Backports-http: /debian-backports/
 Backports-rsync: debian-backports/
@@ -157,52 +212,30 @@
 Volatile-rsync: debian-volatile/
 Volatile-upstream: kassia.debian.org
 Maintainer: Philip Hands <phil@hands.com>
-Country: GB Great Britain
+Country: GB United Kingdom
 Location: London
 Sponsor: Hands.com Ltd http://www.hands.com/
 Sponsor: RapidSwitch Ltd http://www.rapidswitch.com/
-IPv6: no
-
-Site: www.uk.debian.org
-Alias: debian.hands.com
-Type: Push-Primary
-WWW-http: /
-WWW-upstream: www-master.debian.org
-Maintainer: Philip Hands <phil@hands.com>
-Country: GB Great Britain
-Sponsor: Hands.com Ltd http://www.hands.com/
-Sponsor: GX Networks http://www.gxn.net/
-IPv6: no
+IPv6: yes
 
 Site: mirror.aarnet.edu.au
 Type: leaf
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-ftp: /debian/
-Archive-http: /debian/
+X-Archive-http: /debian/
 Archive-rsync: debian/
 Archive-upstream: ftp.wa.au.debian.org
-CDImage-ftp: /pub/debian-cd/
-CDImage-http: /pub/debian-cd/
-CDImage-rsync: debian-cd/
 Security-ftp: /pub/debian-security/
 Security-http: /pub/debian-security/
 Maintainer: mirror@aarnet.edu.au
 Country: AU Australia
 Location: Canberra
 Sponsor: Australian Academic and Research Network http://www.aarnet.edu.au/
-IPv6: no
-
-Site: www.gluck.debian.org
-Type: Push-Primary
-WWW-http: /
-WWW-upstream: www-master.debian.org
-Maintainer: mirrors@debian.org
-Country: AU Australia
-IPv6: no
+IPv6: yes
 
 Site: ftp.monash.edu.au
 Type: leaf
-Archive-architecture: amd64 i386 kfreebsd-amd64 kfreebsd-i386
+Archive-architecture: amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 s390x
 Archive-http: /pub/linux/debian/
 Archive-ftp: /pub/linux/debian/
 Archive-rsync: debian/
@@ -216,7 +249,7 @@
 
 Site: ftp.nluug.nl
 Type: leaf
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-ftp: /pub/os/Linux/distr/debian/
 Archive-http: /pub/os/Linux/distr/debian/
 Archive-upstream: ftp.nl.debian.org
@@ -226,19 +259,6 @@
 Comment: Note that this is same HD but different machine than ftp.surfnet.nl!
 IPv6: yes
 
-Site: ftp.uwa.edu.au
-Type: leaf
-Archive-architecture: amd64 i386 kfreebsd-amd64 kfreebsd-i386
-Archive-ftp: /debian/
-Archive-http: /debian/
-Archive-upstream: ftp.au.debian.org
-NonUS-ftp: /mirrors/linux/debian-non-US/
-Maintainer: David Luyer <luyer@ucs.uwa.edu.au>
-Country: AU Australia
-Location: Perth, Western Australia
-Sponsor: The University of Western Australia http://www.uwa.edu.au/
-IPv6: no
-
 Site: mirror.eftel.com
 Alias: mirror.q-net.net.au
 Alias: mirror.datafast.net.au
@@ -256,7 +276,7 @@
 
 Site: ftp.kulnet.kuleuven.ac.be
 Type: leaf
-X-Archive-architecture: alpha amd64 arm armel hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel sparc
+X-Archive-architecture: amd64 armel hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel sparc
 X-Archive-ftp: /debian/
 X-Archive-http: /debian/
 X-Archive-upstream: ftp.uk.debian.org
@@ -268,9 +288,21 @@
 X-Comment: will be offline Oct 2010: <1266578803.876949.632986167.124793.173@otrs.cc.kuleuven.be>
 
 Site: ftp.dk.debian.org
-Alias: mirrors.dotsrc.org
+Includes: mirrors.dotsrc.org
+Type: Push-Secondary
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
+Archive-ftp: /debian/
+Archive-http: /debian/
+Archive-rsync: debian/
+Archive-upstream: ftp.nl.debian.org
+Country: DK Denmark
+Location: Aalborg
+Sponsor: dotsrc.org - Open Source Software Project Hosting http://dotsrc.org
+IPv6: yes
+
+Site: mirrors.dotsrc.org
 Type: Push-Secondary
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-ftp: /debian/
 Archive-http: /debian/
 Archive-rsync: debian/
@@ -285,13 +317,13 @@
 Country: DK Denmark
 Location: Aalborg
 Sponsor: dotsrc.org - Open Source Software Project Hosting http://dotsrc.org
-IPv6: no
+IPv6: yes
 
 Site: ftp.it.debian.org
 Alias: ftp.bofh.it
 Alias: vlad-tepes.bofh.it
 Type: Push-Secondary
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-ftp: /debian/
 Archive-http: /debian/
 Archive-rsync: debian/
@@ -307,7 +339,7 @@
 
 Site: giano.com.dist.unige.it
 Type: leaf
-Archive-architecture: amd64 arm armel i386
+Archive-architecture: amd64 i386
 Archive-ftp: /debian/
 Archive-http: /debian/
 Archive-upstream: debian.fastweb.it
@@ -327,7 +359,7 @@
 Site: ftp.gtlib.gatech.edu
 Alias: zaphod.gtlib.gatech.edu
 Type: leaf
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-ftp: /pub/debian/
 Archive-http: /debian/
 Archive-rsync: debian/
@@ -345,7 +377,7 @@
 Site: ftp.egr.msu.edu
 Alias: ike.egr.msu.edu
 Type: Push-Primary
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-ftp: /debian/
 Archive-http: /debian/
 Archive-rsync: debian/
@@ -357,29 +389,30 @@
 Country: US United States
 Location: Lansing, Michigan
 Sponsor: College of Engineering at Michigan State University http://www.egr.msu.edu/
-Comment: connected at 100 Mbps full-duplex directly to our Gigabit backbone
+Bandwidth: 100Mbps full-duplex directly to our Gigabit backbone
 IPv6: no
 
 Site: distro.ibiblio.org
 Type: leaf
-Archive-architecture: amd64 i386 ia64 kfreebsd-amd64 kfreebsd-i386
-Archive-ftp: /debian/
-Archive-http: /debian/
-Archive-rsync: debian/
+Archive-architecture: amd64 armhf i386
+X-Archive-ftp: /debian/
+X-Archive-http: /debian/
+X-Archive-rsync: debian/
 Archive-upstream: ftp.us.debian.org
-Maintainer: Don Sizemore <dls@metalab.unc.edu>, ftpkeeper@ibiblio.org
+Maintainer: Don Sizemore <dls@metalab.unc.edu>, ftpkeeper@ibiblio.org, help@rt.ibiblio.org
 Country: US United States
 Location: Chapel Hill, North Carolina
 Sponsor: ibiblio http://www.ibiblio.org/
+Comment: march 2012: mirror removed due to storage shortage
 IPv6: no
 
 Site: debian.man.ac.uk
 Type: leaf
-Archive-architecture: amd64 hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386
+Archive-architecture: amd64 hurd-i386 i386
 Archive-http: /debian/
 Archive-upstream: ftp.uk.debian.org
 Maintainer: Owen Le Blanc <leblanc@mcc.ac.uk>
-Country: GB Great Britain
+Country: GB United Kingdom
 Sponsor: University of Manchester http://www.man.ac.uk/
 Comment: AFS and NFS is available upon request.
 IPv6: no
@@ -388,12 +421,15 @@
 Alias: ftp.debian.cz
 Alias: www.debian.cz
 Type: Push-Primary
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-ftp: /debian/
 Archive-http: /debian/
 Archive-rsync: debian/
 Archive-nfs: /pub/debian/
 Archive-upstream: syncproxy.eu.debian.org
+X-CDImage-ftp: /debian-cd/
+X-CDImage-http: /debian-cd/
+X-CDImage-rsync: debian-cd/
 NonUS-ftp: /debian-non-US/
 NonUS-http: /debian-non-US/
 NonUS-rsync: debian-non-US/
@@ -401,35 +437,34 @@
 Maintainer: Dan Ohnesorg <Dan@ohnesorg.cz>, Petr Cech <Petr.Cech@moment.cz>, root@debian.cz, ftpadmin@debian.cz
 Country: CZ Czech Republic
 Sponsor: CESNET http://www.cesnet.cz/
-IPv6: no
+IPv6: yes
 
 Site: ftp.tu-clausthal.de
 Alias: pegasus.rz.tu-clausthal.de
 Type: leaf
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-ftp: /pub/linux/debian/
 Archive-http: /pub/linux/debian/
 Archive-upstream: ftp.de.debian.org
 Security-ftp: /pub/linux/debian-security/
 CDImage-ftp: /pub/linux/debian-cd/
 CDImage-architecture: amd64 i386 multi-arch powerpc sparc
-Maintainer: Christian Asam <Christian.Asam@tu-clausthal.de>, ftpadm@rz.tu-clausthal.de
+Maintainer: support@rz.tu-clausthal.de
 Country: DE Germany
 Location: Clausthal-Zellerfeld, Niedersachsen
 Sponsor: Rechenzentrum der TU-Clausthal http://www.rz.tu-clausthal.de/
-Comment: Bandwidth limitation: 1 Mbit per downloading IP, 25 Mbit total,
- unlimited from within the campus network.
 IPv6: no
 
 Site: ftp.at.debian.org
 Alias: debian.sil.at
 Alias: ftp.debian.at
 Type: Push-Secondary
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-ftp: /debian/
 Archive-http: /debian/
 Archive-rsync: debian/
 Archive-upstream: syncproxy.eu.debian.org
+Archive-method: push
 Backports-ftp: /debian-backports/
 Backports-http: /debian-backports/
 Backports-rsync: debian-backports/
@@ -448,27 +483,16 @@
 Sponsor: Silver Server http://www.sil.at/
 IPv6: yes
 
-Site: www.debian.at
-Alias: www.at.debian.org
-Type: Push-Primary
-WWW-http: /
-WWW-rsync: www.debian.org/
-WWW-upstream: www-master.debian.org
-Maintainer: Gerfried Fuchs <alfie@sil.at>
-Country: AT Austria
-Location: Vienna
-Sponsor: Silver Server http://www.sil.at/
-IPv6: no
-
 Site: ftp.de.debian.org
 Alias: ftp1.de.debian.org
 Alias: debian.inf.tu-dresden.de
 Type: Push-Primary
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-ftp: /debian/
 Archive-http: /debian/
 Archive-rsync: debian/
 Archive-upstream: ftp-master.debian.org
+Archive-method: push
 Backports-ftp: /debian-backports/
 Backports-http: /debian-backports/
 Backports-rsync: debian-backports/
@@ -484,7 +508,7 @@
 Volatile-http: /debian-volatile/
 Volatile-rsync: debian-volatile/
 Volatile-upstream: kassia.debian.org
-Maintainer: Adam Lackorzynski <adam@os.inf.tu-dresden.de>, debian-ftp@ftp.inf.tu-dresden.de
+Maintainer: Adam Lackorzynski <adam@os.inf.tu-dresden.de>, ftpadm@inf.tu-dresden.de
 Country: DE Germany
 Location: Dresden
 Sponsor: Technical University of Dresden, Dept. of Computer Science http://www.inf.tu-dresden.de/
@@ -493,12 +517,12 @@
 
 Site: mirror.switch.ch
 Type: Push-Secondary
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel i386 kfreebsd-amd64 kfreebsd-i386 sparc
 Archive-ftp: /mirror/debian/
 Archive-http: /ftp/mirror/debian/
 Archive-upstream: ftp.ch.debian.org
 Backports-ftp: /debian-backports/
-Backports-http: /debian-backports/
+Backports-http: /ftp/mirror/debian-backports/
 Backports-upstream: ftp.ch.debian.org
 Backports-method: push
 CDImage-ftp: /mirror/debian-cd/
@@ -511,12 +535,13 @@
 Country: CH Switzerland
 Location: Zurich
 Sponsor: SWITCHmirror http://mirror.switch.ch/
+Bandwidth: 10Gbps
 IPv6: yes
 
 Site: ftp.nara.wide.ad.jp
 Alias: ftp.aist-nara.ac.jp
 Type: Push-Secondary
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
 Archive-ftp: /debian/
 Archive-http: /debian/
 Archive-rsync: debian/
@@ -533,42 +558,24 @@
 Location: Nara
 Sponsor: NARA Institute of Science and Technology http://nara.aist-nara.ac.jp/
 Comment: ftp.nara.wide.ad.jp is reachable via IPv6, ftp.aist-nara.ac.jp is not.
+ @is.aist-nara.ac.jp's maintainer address bounces.
 IPv6: yes
 X-Comment: still has debian-amd64
 
-Site: ftp2.jp.debian.org
-Alias: ftp.debian.or.jp
-Alias: http.debian.or.jp
+Site: ftp.bg.debian.org
+Includes: debian.spnet.net
 Type: Push-Secondary
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-ftp: /debian/
 Archive-http: /debian/
 Archive-rsync: debian/
-Archive-upstream: hanzubon.jp
-Volatile-http: /debian-volatile/
-Volatile-ftp: /debian-volatile/
-Volatile-rsync: debian-volatile/
-Maintainer: debian-admin@debian.or.jp
-Country: JP Japan
-Location: Kashiwa NOC, Chiba
-Sponsor: Fonfun Co., Ltd. http://www.fonfun.co.jp/
-IPv6: no
-
-Site: www.jp.debian.org
-Type: Push-Primary
-WWW-http: /
-WWW-rsync: www.debian.org/
-WWW-upstream: www-master.debian.org
-Maintainer: Debian JP Project <debian-admin@debian.or.jp>
-Country: JP Japan
-Location: Tokyo
-Sponsor: OSDN Japan http://osdn.jp/
-IPv6: no
+Archive-upstream: ftp2.de.debian.org
+Country: BG Bulgaria
+IPv6: yes
 
-Site: ftp.bg.debian.org
-Alias: debian.spnet.net
+Site: debian.spnet.net
 Type: Push-Secondary
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-ftp: /debian/
 Archive-http: /debian/
 Archive-rsync: debian/
@@ -579,20 +586,9 @@
 Sponsor: Spectrum NET http://spnet.net/
 IPv6: no
 
-Site: www.bg.debian.org
-Alias: debian.spnet.net
-Type: leaf
-WWW-http: /
-WWW-upstream: www-master.debian.org
-Maintainer: Peter Shtinkov <shtinkov@spnet.net>
-Country: BG Bulgaria
-Location: Sofia
-Sponsor: Spectrum NET http://spnet.net/
-IPv6: no
-
 Site: ftp-mirror.internap.com
 Type: leaf
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-ftp: /pub/debian/
 Archive-http: /pub/debian/
 Archive-upstream: ftp.gtlib.gatech.edu
@@ -600,7 +596,7 @@
 Location: Seattle
 Country: US United States
 Sponsor: InterNAP Network Services http://www.internap.com/
-Comment: on a dedicated 10 Mbps network segment
+Bandwidth: 10 Mbps
 IPv6: no
 
 Site: ftp.cerias.purdue.edu
@@ -612,29 +608,19 @@
 IPv6: no
 
 Site: ftp.ru.debian.org
-Alias: ftp.chg.ru
+Includes: mirror.mephi.ru 
 Type: leaf
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-ftp: /debian/
 Archive-http: /debian/
 Archive-rsync: debian/
 Archive-upstream: ftp.se.debian.org
-CDImage-ftp: /pub/Linux/debian-cd/
-CDImage-http: /pub/Linux/debian-cd/
-CDImage-rsync: debian-iso/
-Volatile-http: /debian-volatile/
-Volatile-ftp: /debian-volatile/
-Volatile-rsync: debian-volatile/
-Maintainer: Serge Krashakov <sakr@Chg.RU>, ftp@Chg.RU
 Country: RU Russia
-Location: Chernogolovka, Moscow
-Sponsor: Chernogolovka Science Center http://www.chg.ru/
-IPv6: yes
-X-Comment: still has debian-amd64
+IPv6: no
 
 Site: ftp.sunet.se
 Type: leaf
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-ftp: /pub/Linux/distributions/debian/
 Archive-http: /pub/Linux/distributions/debian/
 Archive-rsync: Debian/
@@ -643,10 +629,10 @@
 NonUS-ftp: /pub/Linux/distributions/debian-non-US/
 NonUS-rsync: Debian-non-US/
 NonUS-upstream: non-us.debian.org
-CDImage-ftp: /pub/Linux/distributions/debian-cd/
+X-CDImage-ftp: /pub/Linux/distributions/debian-cd/
 CDImage-http: /pub/Linux/distributions/debian-cd/
 CDImage-rsync: Debian-cd/
-Maintainer: Patrik Karen <archive@ftp.sunet.se>
+Maintainer: archive@ftp.sunet.se
 Country: SE Sweden
 Location: Uppsala
 Sponsor: Swedish University Network http://www.sunet.se/
@@ -655,7 +641,7 @@
 
 Site: freedom.dicea.unifi.it
 Type: leaf
-Archive-architecture: amd64 hurd-i386 i386
+Archive-architecture: amd64 armhf hurd-i386 i386 s390x
 Archive-ftp: /pub/linux/debian/
 Archive-http: /ftp/pub/linux/debian/
 Archive-nfs: /var/ftp/
@@ -667,9 +653,19 @@
 IPv6: no
 
 Site: ftp.pl.debian.org
-Alias: ftp.task.gda.pl
+Includes: ftp.task.gda.pl
+Type: Push-Primary
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
+Archive-http: /debian/
+Archive-ftp: /debian/
+Archive-rsync: ftp/site/debian/
+Archive-upstream: syncproxy.eu.debian.org
+Country: PL Poland
+IPv6: yes
+
+Site: ftp.task.gda.pl
 Type: Push-Primary
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-http: /debian/
 Archive-ftp: /debian/
 Archive-rsync: ftp/site/debian/
@@ -677,22 +673,35 @@
 NonUS-ftp: /debian-non-US/
 NonUS-http: /debian-non-US/
 NonUS-rsync: debian-non-US/
-CDImage-http: /debian-cd/
+X-CDImage-http: /debian-cd/
 CDImage-rsync: debian-iso/
 Maintainer: Michal Bialoskorski <skorka@task.gda.pl>, ftpadmin@task.gda.pl
 Country: PL Poland
 Location: Gda&#324;sk
 Sponsor: Technical University of Gda&#324;sk http://www.task.gda.pl/
-IPv6: no
+IPv6: yes
+
+Site: debian.inhost.pro
+Type: leaf
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
+Archive-http: /debian/
+IPv6: yes
+Archive-upstream: ftp.pl.debian.org
+Updates: four
+Maintainer: Sebastian Podjasek <admin@inhost.pro>
+Country: PL Poland
+Location: PL, 39200 Debica
+Sponsor: inhosting.pro http://inhosting.pro/
+Bandwidth: 1Gbps
 
 Site: ftp.rfc822.org
 Alias: source.rfc822.org
 Type: Push-Primary
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
-Archive-ftp: /debian/
-Archive-http: /debian/
-Archive-rsync: debian/
-Archive-upstream: syncproxy.eu.debian.org
+X-Archive-architecture: amd64 armel hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+X-Archive-ftp: /debian/
+X-Archive-http: /debian/
+X-Archive-rsync: debian/
+X-Archive-upstream: syncproxy.eu.debian.org
 NonUS-ftp: /debian-non-US/
 NonUS-http: /debian-non-US/
 NonUS-rsync: debian-non-US/
@@ -707,17 +716,17 @@
 Location: Guetersloh
 Sponsor: mediaWays GmbH http://www.mediaways.net/
 Comment: non-DFN
-IPv6: no
+IPv6: yes
 
 Site: ftp.iut-bm.univ-fcomte.fr
 Alias: debian.iut-bm.univ-fcomte.fr
 Type: leaf
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-ftp: /debian/
 Archive-http: /debian/
 Archive-rsync: debian/
-CDImage-ftp: /debian-iso/debian-official/
-CDImage-http: /debian-iso/debian-official/
+CDImage-ftp: /debian-cd/
+CDImage-http: /debian-cd/
 CDImage-rsync: debian-iso/debian-official/
 Archive-upstream: ftp.fr.debian.org
 Maintainer: Jean-Luc Anthoine <ftpadmin@iut-bm.univ-fcomte.fr>
@@ -729,7 +738,7 @@
 Site: debian.polytech-lille.fr
 Alias: ftp.eudil.fr
 Type: leaf
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-ftp: /debian/
 Archive-http: /debian/
 Archive-rsync: debian/
@@ -738,13 +747,13 @@
 Maintainer: Patrick Menager <cinfo@polytech-lille.fr>
 Country: FR France
 Location: Villeneuve d'ascq, université de Lille1
-Comment: 100Mbps (RENATER)
+Bandwidth: 100Mbps (RENATER)
 Sponsor: Polytech'Lille http://www.polytech-lille.fr/
 
 Site: ftp.pt.debian.org
 Alias: ftp.uevora.pt
 Type: Push-Primary
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-http: /debian/
 Archive-ftp: /debian/
 Archive-rsync: debian/
@@ -757,7 +766,7 @@
 CDImage-ftp: /debian-cd/
 CDImage-rsync: debian-cd/
 CDImage-upstream: cdimage.debian.org
-Maintainer: Tiago Fernandes <tj@uevora.pt>
+Maintainer: ftp@uevora.pt
 Country: PT Portugal
 Location: &Eacute;vora
 Sponsor: &Eacute;vora University Computing Services http://www.sc.uevora.pt/
@@ -772,32 +781,41 @@
 Maintainer: ftp-admin@arnes.si
 Country: SI Slovenia
 Sponsor: ARNES http://www.arnes.si/
-IPv6: no
+IPv6: yes
 
 Site: ftp.fr.debian.org
-Alias: debian.proxad.net
-Alias: ftpmirror.proxad.net
+Includes: debian.proxad.net
 Type: Push-Primary
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-ftp: /debian/
 Archive-http: /debian/
 Archive-rsync: debian/
 Archive-upstream: syncproxy.eu.debian.org
-NonUS-ftp: /debian-non-US/
-NonUS-http: /debian-non-US/
-NonUS-rsync: debian-non-US/
-NonUS-upstream: non-us.debian.org
-Maintainer: Aur&eacute;lien Beaujean <ftpmaint@proxad.net>
+Country: FR France
+IPv6: yes
+
+Site: debian.proxad.net
+Type: Push-Primary
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
+Archive-ftp: /debian/
+Archive-http: /debian/
+Archive-rsync: debian/
+Archive-upstream: syncproxy.eu.debian.org
+Backports-ftp: /debian-backports/
+Backports-http: /debian-backports/
+Backports-rsync: debian-backports/
+Backports-upstream: syncproxy3.eu.debian.org 
+Backports-method: push
+Maintainer: Aur&eacute;lien Beaujean <ftpmaint@proxad.net>, abeaujean@proxad.net
 Country: FR France
 Sponsor: Proxad http://www.proxad.net/
 Sponsor: free.fr http://www.free.fr/
-IPv6: no
-X-Comment: still has debian-amd64
+IPv6: yes
 
 Site: ftp.tw.debian.org
 Alias: debian.linux.org.tw
 Type: Push-Primary
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-ftp: /debian/
 Archive-http: /debian/
 Archive-rsync: debian/
@@ -821,36 +839,30 @@
 Sponsor: Computer & Information Networking Center, National Taiwan University http://www.cc.ntu.edu.tw/
 IPv6: no
 
-Site: www-debian.linux.org.tw
-WWW-http: /
-WWW-upstream: www-master.debian.org
-Type: Push-Primary
-Maintainer: Andrew Lee <andrew@linux.org.tw>
-Country: TW Taiwan
-Location: Taipei
-Sponsor: Computer & Information Networking Center, National Taiwan University http://www.cc.ntu.edu.tw/
-
 Site: ftp.proxad.net
 Alias: ftp.free.fr
 Alias: ftp.online.fr
 Alias: ftp.proxad.fr
 Type: leaf
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-ftp: /mirrors/ftp.debian.org/
+Archive-http: /mirrors/ftp.debian.org/
 Archive-upstream: ftp.fr.debian.org
 NonUS-ftp: /mirrors/nonus.debian.org/
+NonUS-http: /mirrors/nonus.debian.org/
 CDImage-ftp: /mirrors/cdimage.debian.org/debian-cd/
+CDImage-http: /mirrors/cdimage.debian.org/debian-cd/
 Volatile-ftp: /mirrors/volatile.debian.net/
-WWW-ftp: /mirrors/web.debian.org/
+Volatile-http: /mirrors/volatile.debian.net/
 Maintainer: ftpmaint@proxad.net
 Country: FR France
 Sponsor: Proxad http://www.proxad.net/
 Sponsor: free.fr http://www.free.fr/
-IPv6: no
+IPv6: yes
 
 Site: debian.uni-duisburg-essen.de
 Type: leaf
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 powerpc
 Archive-http: /debian/
 Archive-ftp: /debian/
 Archive-upstream: ftp.de.debian.org
@@ -862,55 +874,33 @@
 Sponsor: Universitaet Duisburg-Essen http://www.uni-duisburg-essen.de/
 IPv6: no
 
-Site: www.mirrorservice.org
+Site: mirrorservice.org
+Aliases: ftp.mirrorservice.org
+Aliases: rsync.mirrorservice.org
+Aliases: www.mirrorservice.org
 Type: leaf
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-http: /sites/ftp.debian.org/debian/
-Archive-upstream: ftp.de.debian.org
-Backports-http: /sites/backports.org/
-Backports-upstream: syncproxy.backports.org
-NonUS-http: /sites/non-us.debian.org/debian-non-US/
-CDImage-http: /sites/cdimage.debian.org/debian-cd/
-Volatile-http: /sites/volatile.debian.net/
-Maintainer: help@mirrorservice.org, archive-admin@mirrorservice.org
-Country: GB Great Britain
-Location: Canterbury
-Sponsor: University of Kent Computer Science department http://www.mirrorservice.org/
-IPv6: no
-
-Site: ftp.mirrorservice.org
-Type: leaf
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
 Archive-ftp: /sites/ftp.debian.org/debian/
-Archive-upstream: ftp.de.debian.org
-NonUS-ftp: /sites/non-us.debian.org/debian-non-US/
-CDImage-ftp: /sites/cdimage.debian.org/debian-cd/
-Volatile-ftp: /sites/volatile.debian.net/
-Maintainer: help@mirrorservice.org
-Country: GB Great Britain
-Location: Canterbury
-Sponsor: University of Kent Computer Science department http://www.mirrorservice.org/
-IPv6: no
-
-Site: rsync.mirrorservice.org
-Type: leaf
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
 Archive-rsync: ftp.debian.org/debian/
-Archive-upstream: ftp.de.debian.org
-Backports-rsync: backports.org/
-Backports-upstream: syncproxy.backports.org
-NonUS-rsync: non-us.debian.org/debian-non-US/
+Archive-upstream: syncproxy.eu.debian.org
+Backports-http: /sites/backports.debian.org/debian-backports/
+Backports-ftp: /sites/backports.debian.org/debian-backports/
+Backports-rsync: backports.debian.org/debian-backports
+Backports-upstream: ftp.uk.debian.org
+CDImage-http: /sites/cdimage.debian.org/debian-cd/
+CDImage-ftp: /sites/cdimage.debian.org/debian-cd/
 CDImage-rsync: cdimage.debian.org/debian-cd/
-Volatile-rsync: volatile.debian.net/
+CDImage-upstream: cdimage.debian.org
 Maintainer: help@mirrorservice.org, archive-admin@mirrorservice.org
-Country: GB Great Britain
+Country: GB United Kingdom
 Location: Canterbury
-Sponsor: University of Kent Computer Science department http://www.mirrorservice.org/
+Sponsor: University of Kent School of Computing http://www.mirrorservice.org/
 IPv6: no
 
 Site: ftp.dti.ad.jp
 Type: leaf
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-ftp: /pub/Linux/debian/
 Archive-http: /pub/Linux/debian/
 Archive-upstream: ftp.jp.debian.org
@@ -923,7 +913,7 @@
 
 Site: ftp.esat.net
 Type: leaf
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-http: /pub/linux/debian/
 Archive-ftp: /pub/linux/debian/
 Archive-upstream: ftp.ie.debian.org
@@ -951,24 +941,9 @@
 Sponsor: Hermes Softlab http://www.hermes.si/
 IPv6: no
 
-Site: mirror.cs.wisc.edu
-Type: leaf
-Archive-architecture: amd64 i386 kfreebsd-amd64 kfreebsd-i386
-Archive-ftp: /debian/
-Archive-http: /debian/
-Archive-rsync: debian/
-Archive-upstream: debian.mirrors.tds.net
-CDImage-ftp: /debian-cd/
-CDImage-http: /debian-cd/
-Maintainer: mirror-admin@cs.wisc.edu
-Country: US United States
-Location: Madison, Wisconsin
-Sponsor: Computer Sciences Department, The University of Wisconsin - Madison http://www.cs.wisc.edu
-IPv6: yes
-
 Site: ftp.kfki.hu
 Type: leaf
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-ftp: /pub/linux/debian/
 Archive-http: /linux/debian/
 Archive-rsync: ftp/linux/debian/
@@ -985,38 +960,27 @@
 Site: ftp.hk.debian.org
 X-Alias: ftp.debian.org.hk
 Type: leaf
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 i386
 Archive-ftp: /debian/
 Archive-http: /debian/
 Archive-rsync: debian/
 Archive-upstream: ftp.de.debian.org
-CDImage-ftp: /debian-cd/
-CDImage-http: /debian-cd/
-CDImage-rsync: debian-cd/
+X-CDImage-ftp: /debian-cd/
+X-CDImage-http: /debian-cd/
+X-CDImage-rsync: debian-cd/
 Maintainer: Roy Hiu-yeung Chan <hychan@debian.org.hk>, Anthony Wong <ypwong@debian.org.hk>, ypwong@gmail.com, Roy Hiu-yeung Chan <roy.the.geek@gmail.com>
 Country: HK Hong Kong
 Location: Hong Kong
 Sponsor: Hong Kong Debian enthusiasts http://www.debian.org.hk/
 IPv6: no
 
-Site: www.de.debian.org
-Type: Push-Primary
-WWW-http: /
-WWW-rsync: debian-www/
-WWW-upstream: www-master.debian.org
-Maintainer: Adam Lackorzynski <al10@inf.tu-dresden.de>
-Country: DE Germany
-Sponsor: Technical University of Dresden, Dept. of Computer Science http://www.inf.tu-dresden.de/
-Comment: rsync access isn't anonymously available
-IPv6: no
-
 Site: gd.tuwien.ac.at
 Alias: ftp.tuwien.ac.at
 Type: leaf
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-http: /opsys/linux/debian/
 Archive-upstream: ftp.de.debian.org
-CDImage-http: /opsys/linux/debian-cd/
+X-CDImage-http: /opsys/linux/debian-cd/
 Maintainer: Antonin Sprinzl <Antonin.Sprinzl@tuwien.ac.at>
 Country: AT Austria
 Location: Vienna
@@ -1027,7 +991,7 @@
 Alias: ftp.uninett.no
 Alias: ftp.uio.no
 Type: Push-Secondary
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-ftp: /debian/
 Archive-http: /debian/
 Archive-rsync: debian/
@@ -1035,20 +999,20 @@
 Archive-method: push
 CDImage-ftp: /debian-cd/
 CDImage-http: /debian-cd/
-CDImage-rsync: debian-cd/
+X-CDImage-rsync: debian-cd/
 CDImage-upstream: cdimage.debian.org
 Maintainer: Morten Werner Forsbring <ftp-drift@uio.no>
 Country: NO Norway
 Location: Oslo
 Sponsor: USIT, University of Oslo, Norway http://www.usit.uio.no/
 Sponsor: Uninett http://www.uninett.no/
-Comment: 1Gbps interface into the NIX, very good connectivity
-IPv6: no
+Bandwidth: 1Gbps interface into the NIX, very good connectivity
+IPv6: yes
 
 Site: ftp.icm.edu.pl
 Alias: sunsite.icm.edu.pl
 Type: leaf
-Archive-architecture: alpha amd64 hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 powerpc sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-ftp: /pub/Linux/debian/
 Archive-http: /pub/Linux/debian/
 Archive-rsync: debian/
@@ -1063,11 +1027,11 @@
 Country: PL Poland
 Location: Warsaw
 Sponsor: Interdisciplinary Centre for Mathematical and Computational Modelling Warsaw University http://www.icm.edu.pl/
-IPv6: no
+IPv6: yes
 
 Site: ftp.freenet.de
 Type: leaf
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-ftp: /debian/
 Archive-http: /debian/
 Archive-upstream: ftp.de.debian.org
@@ -1075,25 +1039,37 @@
 Country: DE Germany
 Location: D&uuml;sseldorf
 Sponsor: freenet.de AG http://www.freenet.de/
+Comment: README file in mirror points to service@ address
 IPv6: yes
 
 Site: ftp.uwsg.indiana.edu
 Alias: uwsg.iu.edu
 Type: leaf
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-ftp: /linux/debian/
 Archive-http: /linux/debian/
 Archive-upstream: debian.osuosl.org
 Maintainer: Unix Workstation Support Group <uwsg@indiana.edu>
 Country: US United States
 Location: Bloomington, Indiana
+Comment: maintiner address bounces
 Sponsor: Unix Workstation Support Group at Indiana University http://www.uwsg.indiana.edu/
 IPv6: no
 
 Site: ftp.hu.debian.org
-Alias: ftp.fsn.hu
+Includes: ftp.fsn.hu
+Type: Push-Secondary
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
+Archive-ftp: /debian/
+Archive-http: /debian/
+Archive-rsync: linux/debian/
+Archive-upstream: ftp.de.debian.org
+Country: HU Hungary
+IPv6: no
+
+Site: ftp.fsn.hu
 Type: Push-Secondary
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-ftp: /debian/
 Archive-http: /debian/
 Archive-rsync: linux/debian/
@@ -1106,25 +1082,29 @@
 Sponsor: Axelero Internet PLC http://www.axelero.com/
 IPv6: no
 
-Site: www.ru.debian.org
-Alias: www.debian.org.ru
-Type: leaf
-WWW-http: /
-WWW-upstream: www-master.debian.org
-Maintainer: Max Kosmach <max@tcen.ru>
-Country: RU Russia
-Location: Zelengrad, Moscow
-Sponsor: Technological Centre, Moscow Institute of Electronic Engineering http://www.tcen.ru/
+Site: ftp.nz.debian.org
+Includes: ftp.citylink.co.nz
+Type: Push-Primary
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
+Archive-ftp: /debian/
+Archive-http: /debian/
+Archive-rsync: debian/
+Archive-upstream: syncproxy.wna.debian.org
+Country: NZ New Zealand
 IPv6: no
 
-Site: ftp.nz.debian.org
-Alias: ftp.citylink.co.nz
+Site: ftp.citylink.co.nz
 Type: Push-Primary
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-ftp: /debian/
 Archive-http: /debian/
 Archive-rsync: debian/
 Archive-upstream: syncproxy.wna.debian.org
+Backports-ftp: /debian-backports/
+Backports-http: /debian-backports/
+Backports-rsync: debian-backports/
+Backports-upstream: backports-master.debian.org
+Backports-method: push
 Volatile-http: /debian-volatile/
 Volatile-ftp: /debian-volatile/
 Volatile-rsync: debian-volatile/
@@ -1136,7 +1116,7 @@
 
 Site: ftp.eq.uc.pt
 Type: leaf
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-ftp: /pub/software/Linux/debian/
 Archive-http: /software/Linux/debian/
 Archive-upstream: ftp.pt.debian.org
@@ -1152,7 +1132,7 @@
 Alias: algo.mur.at
 Alias: spider.mur.at
 Type: leaf
-Archive-architecture: amd64 i386 ia64 kfreebsd-amd64 kfreebsd-i386
+Archive-architecture: amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 powerpc
 Archive-http: /debian/
 Archive-ftp: /debian/
 Archive-upstream: ftp.at.debian.org
@@ -1160,11 +1140,11 @@
 Country: AT Austria
 Location: Graz
 Sponsor: mur.at http://mur.at/
-IPv6: no
+IPv6: yes
 
 Site: ftp.uni-erlangen.de
 Type: Push-Secondary
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-ftp: /debian/
 Archive-http: /debian/
 Archive-upstream: ftp.nl.debian.org
@@ -1172,11 +1152,11 @@
 Country: DE Germany
 Location: Erlangen
 Sponsor: University of Erlangen http://www.uni-erlangen.de/
-IPv6: no
+IPv6: yes
 
 Site: debian.otenet.gr
 Type: leaf
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-ftp: /pub/linux/debian/
 Archive-http: /debian/
 Archive-upstream: ftp.fr.debian.org
@@ -1191,7 +1171,7 @@
 Site: dennou-k.gfd-dennou.org
 Alias: dennou-k.gaia.h.kyoto-u.ac.jp
 Type: Push-Secondary
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-ftp: /debian/
 Archive-http: /debian/
 Archive-rsync: debian/
@@ -1206,7 +1186,7 @@
 Site: dennou-q.gfd-dennou.org
 Alias: dennou-q.geo.kyushu-u.ac.jp
 Type: Push-Secondary
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-ftp: /debian/
 Archive-http: /debian/
 Archive-upstream: dennou-k.gfd-dennou.org
@@ -1220,7 +1200,7 @@
 Site: ftp2.fr.debian.org
 Alias: ftp.oleane.net
 Type: Push-Secondary
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-ftp: /debian/
 Archive-http: /debian/
 Archive-rsync: debian/
@@ -1234,14 +1214,14 @@
 
 Site: ftp.ndlug.nd.edu
 Type: leaf
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
-Archive-ftp: /debian/
-Archive-http: /mirrors/debian/
-Archive-rsync: debian/
+Archive-architecture: amd64 armhf hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 powerpc
+X-Archive-ftp: /debian/
+X-Archive-http: /mirrors/debian/
+X-Archive-rsync: debian/
 Archive-upstream: debian.lcs.mit.edu
 CDImage-ftp: /debian-cd/
 CDImage-http: /mirrors/debian-cd/
-CDImage-rsync: debian-cd/
+X-CDImage-rsync: debian-cd/
 Maintainer: Branden Moore <osm@cse.nd.edu>
 Country: US United States
 Location: Notre Dame, Indiana
@@ -1265,7 +1245,7 @@
 Site: debian.ua.pt
 Alias: ftp.ua.pt
 Type: leaf
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-ftp: /debian/
 Archive-http: /debian/
 Archive-upstream: ftp.de.debian.org
@@ -1273,13 +1253,13 @@
 Country: PT Portugal
 Location: Aveiro
 Sponsor: Informatics and Communication Center, University of Aveiro http://www.ua.pt/
-Comment: T3+ bandwidth to FCCN
+Comment: T3+ bandwidth to FCCN; ftp-adm address bounces
 IPv6: no
 
 Site: debian.uchicago.edu
 Alias: linux.uchicago.edu
 Type: leaf
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-ftp: /debian/
 Archive-http: /debian/
 Archive-upstream: ftp.egr.msu.edu
@@ -1289,31 +1269,9 @@
 Sponsor: University of Chicago http://www.uchicago.edu/
 IPv6: no
 
-Site: www.za.debian.org
-Alias: www.leg.uct.ac.za
-Type: Push-Primary
-WWW-http: /
-WWW-upstream: www-master.debian.org
-Maintainer: Michael-John Turner <mj@debian.org>, mirror@leg.uct.ac.za
-Country: ZA South Africa
-Location: Cape Town
-Sponsor: University of Cape Town Linux Enthusiasts Group http://www.leg.uct.ac.za/
-IPv6: no
-
-Site: www.es.debian.org
-Alias: debian.ci.uv.es
-Type: Push-Secondary
-WWW-http: /
-WWW-upstream: www.de.debian.org
-Maintainer: Jordi Mallach <jordi@debian.org>
-Country: ES Spain
-Location: Valencia
-Sponsor: University of Valencia http://www.uv.es/
-IPv6: no
-
 Site: ftp.irb.hr
 Type: Push-Secondary
-Archive-architecture: alpha amd64 arm armel hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armhf i386 s390x
 Archive-ftp: /debian/
 Archive-http: /debian/
 Archive-upstream: ftp.hr.debian.org
@@ -1324,9 +1282,21 @@
 IPv6: no
 
 Site: ftp.se.debian.org
-Alias: ftp.acc.umu.se
+Includes: ftp.acc.umu.se
+Type: Push-Primary
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
+Archive-ftp: /debian/
+Archive-http: /debian/
+Archive-rsync: debian/
+Archive-nfs: /debian/
+Archive-upstream: kassia.debian.org
+Country: SE Sweden
+IPv6: yes
+
+Site: ftp.acc.umu.se
+Alias: churchill.acc.umu.se
 Type: Push-Primary
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-ftp: /debian/
 Archive-http: /debian/
 Archive-rsync: debian/
@@ -1349,25 +1319,25 @@
 Site: carroll.aset.psu.edu
 Alias: carroll.cac.psu.edu
 Type: leaf
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-ftp: /pub/linux/distributions/debian/
 Archive-http: /pub/linux/distributions/debian/
 Archive-rsync: debian/
 Archive-upstream: mirrors.kernel.org
-CDImage-ftp: /pub/linux/distributions/debian-cd/
-CDImage-http: /pub/linux/distributions/debian-cd/
+X-CDImage-ftp: /pub/linux/distributions/debian-cd/
+X-CDImage-http: /pub/linux/distributions/debian-cd/
 CDImage-rsync: debian-cd/
 Maintainer: ftpkeeper@carroll.cac.psu.edu, ftp@carroll.aset.psu.edu
 Country: US United States
 Location: Pennsylvania
 Sponsor: Pennsylvania State University http://www.cac.psu.edu/
-IPv6: no
+IPv6: yes
 X-Comment: http daemon often reach max connections
 
 Site: ftp.informatik.rwth-aachen.de
 Alias: sunsite.informatik.rwth-aachen.de
 Type: leaf
-Archive-architecture: alpha amd64 i386 powerpc sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-ftp: /pub/Linux/debian/
 Archive-http: /ftp/pub/Linux/debian/
 Archive-upstream: ftp.de.debian.org
@@ -1384,7 +1354,7 @@
 
 Site: ftp.lip6.fr
 Type: leaf
-Archive-architecture: amd64 i386 kfreebsd-amd64 kfreebsd-i386
+Archive-architecture: amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 s390x
 Archive-ftp: /pub/linux/distributions/debian/
 Archive-http: /pub/linux/distributions/debian/
 Archive-upstream: ftp.fr.debian.org
@@ -1397,14 +1367,14 @@
 Site: ftp.fi.debian.org
 Alias: trumpetti.atm.tut.fi
 Type: Push-Primary
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-ftp: /debian/
 Archive-http: /debian/
 Archive-rsync: debian/
 Archive-upstream: syncproxy.eu.debian.org
 CDImage-ftp: /debian-cd/
 CDImage-http: /debian-cd/
-CDImage-rsync: debian-cd/
+X-CDImage-rsync: debian-cd/
 Volatile-http: /debian-volatile/
 Volatile-ftp: /pub/debian-volatile/
 Volatile-rsync: debian-volatile/
@@ -1417,7 +1387,7 @@
 
 Site: ftp-stud.hs-esslingen.de
 Type: leaf
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-ftp: /debian/
 Archive-http: /debian/
 Archive-rsync: debian/
@@ -1438,13 +1408,12 @@
 Country: DE Germany
 Location: Esslingen, Germany
 Sponsor: Computing Center, University of Applied Sciences Esslingen http://www.hs-esslingen.de/
-Comment: 2 Gbps
-
+Bandwidth: 2 Gbps
 
 Site: debian.sh.cvut.cz
 Alias: ftp.sh.cvut.cz
 Type: leaf
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-ftp: /debian/
 Archive-http: /debian/
 Archive-nfs: /debian/
@@ -1456,11 +1425,11 @@
 Country: CZ Czech Republic
 Location: Prague
 Sponsor: Silicon Hill, Czech Technical University Prague http://www.sh.cvut.cz/
-IPv6: no
+IPv6: yes
 
 Site: gladiator.real-time.com
 Type: leaf
-Archive-architecture: alpha amd64 i386 powerpc sparc
+Archive-architecture: amd64 i386 kfreebsd-amd64 kfreebsd-i386
 Archive-ftp: /linux/debian/
 Archive-upstream: mirrors.kernel.org
 Maintainer: Scott Dier <dieman@ringworld.org>
@@ -1471,7 +1440,7 @@
 
 Site: mirrors.kernel.org
 Type: Push-Primary
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-ftp: /debian/
 Archive-http: /debian/
 Archive-rsync: debian/
@@ -1488,14 +1457,14 @@
 
 Site: mirrors.nl.kernel.org
 Type: Push-Primary
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
-Archive-ftp: /debian/
-Archive-http: /debian/
-Archive-rsync: debian/
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
+X-Archive-ftp: /debian/
+X-Archive-http: /debian/
+X-Archive-rsync: debian/
 Archive-upstream: ftp-master.debian.org
 CDImage-ftp: /debian-cd/
 CDImage-http: /debian-cd/
-CDImage-rsync: debian-cd/
+X-CDImage-rsync: debian-cd/
 CDImage-upstream: cdimage.debian.org
 Maintainer: ftpadmin@kernel.org
 Country: NL Netherlands
@@ -1505,14 +1474,14 @@
 
 Site: mirrors.se.kernel.org
 Type: Push-Primary
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
-Archive-ftp: /debian/
-Archive-http: /debian/
-Archive-rsync: debian/
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
+X-Archive-ftp: /debian/
+X-Archive-http: /debian/
+X-Archive-rsync: debian/
 Archive-upstream: ftp-master.debian.org
 CDImage-ftp: /debian-cd/
 CDImage-http: /debian-cd/
-CDImage-rsync: debian-cd/
+X-CDImage-rsync: debian-cd/
 CDImage-upstream: cdimage.debian.org
 Maintainer: ftpadmin@kernel.org
 Country: SE Sweden
@@ -1535,7 +1504,7 @@
 Site: mirrors.xmission.com
 Alias: mirror.xmission.com
 Type: leaf
-Archive-architecture: amd64 hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 powerpc sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-ftp: /debian/
 Archive-http: /debian/
 Archive-rsync: debian/
@@ -1547,31 +1516,32 @@
 Country: US United States
 Location: Salt Lake City, Utah
 Sponsor: XMission http://www.xmission.com/
-IPv6: no
+IPv6: yes
 
 Site: ftp.keystealth.org
 Type: leaf
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-ftp: /debian/
 Archive-rsync: debian/
 Archive-http: /debian/
 Archive-upstream: mirrors.kernel.org
-CDImage-ftp: /debian-cd/
-CDImage-http: /debian-cd/
-CDImage-rsync: debian/
+X-CDImage-ftp: /debian-cd/
+X-CDImage-http: /debian-cd/
+X-CDImage-rsync: debian/
 Maintainer: Scott Neville <scott@keystealth.org>
 Country: US United States
 Location: Redwood City, California
 IPv6: no
+Comment: cdimage mirror is still out of date
 
 Site: debian.yorku.ca
 Type: leaf
-Archive-architecture: amd64 i386
+Archive-architecture: amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 s390x
 Archive-http: /debian/
 Archive-upstream: ftp.egr.msu.edu
 CDImage-http: /debian-cd/
 Security-http: /debian-security/
-Maintainer: debian-mirrors@yorku.ca 
+Maintainer: debian-mirrors@yorku.ca
 Country: CA Canada
 Location: Toronto, Ontario
 Sponsor: York University http://www.yorku.ca/
@@ -1579,7 +1549,7 @@
 
 Site: ftp.stw-bonn.de
 Type: leaf
-Archive-architecture: amd64 i386 kfreebsd-amd64 kfreebsd-i386
+Archive-architecture: amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 s390x
 Archive-ftp: /debian/
 Archive-http: /debian/
 Archive-upstream: ftp.de.debian.org
@@ -1602,14 +1572,14 @@
 Site: debian.ens-cachan.fr
 Alias: ftp.ens-cachan.fr
 Type: leaf
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-ftp: /debian/
 Archive-http: /ftp/debian/
 Archive-upstream: ftp.de.debian.org
 NonUS-ftp: /debian-non-US/
 NonUS-http: /ftp/debian-non-US/
-CDImage-ftp: /debian-cd/
-CDImage-http: /ftp/debian-cd/
+X-CDImage-ftp: /debian-cd/
+X-CDImage-http: /ftp/debian-cd/
 Volatile-http: /debian-volatile/
 Volatile-ftp: /debian-volatile/
 Maintainer: Emmanuel Quemener <Emmanuel.Quemener@cri.ens-cachan.fr>
@@ -1619,7 +1589,7 @@
 
 Site: ftp.easynet.be
 Type: leaf
-Archive-architecture: amd64 armel hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mipsel powerpc sparc
+Archive-architecture: amd64 i386
 Archive-ftp: /debian/
 Archive-http: /ftp/debian/
 Archive-upstream: ftp.nl.debian.org
@@ -1632,7 +1602,7 @@
 Site: ftp.litnet.lt
 Alias: debina.ktu.lt
 Type: Push-Secondary
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-ftp: /debian/
 Archive-http: /debian/
 Archive-rsync: debian/
@@ -1655,35 +1625,38 @@
 Country: LT Lithuania
 Location: http://ftp.litnet.lt
 Sponsor: Lithuanian Academical and Research Network (LitNET) http://www.litnet.lt
-Comment: 100Mbps
+Bandwidth: 100Mbps
 
 Site: ftp.ticklers.org
 Alias: rib.ticklers.org
 Type: leaf
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-ftp: /debian/
 Archive-http: /debian/
 Archive-rsync: debian/
 Archive-upstream: ftp.uk.debian.org
 CDImage-ftp: /debian-cd/
 CDImage-http: /debian-cd/
-Volatile-ftp: /debian-volatile/
-Volatile-http: /debian-volatile/
-Volatile-rsync: debian-volatile/
-Volatile-upstream: volatile.debian.org
+Backports-ftp: /debian-backports/
+Backports-http: /debian-backports/
+Backports-upstream: ftp.uk.debian.org
 Security-ftp: /debian-security/
 Security-http: /debian-security/
 Security-rsync: debian-security/
 Security-upstream: security.debian.org
+Old-ftp: /debian-archive/
+Old-http: /debian-archive/
+Old-rsync: archive.debian.org/
+Old-upstream: archive.debian.org
 Maintainer: Alister Winfield <alister@ticklers.org>, debian-mirror@ticklers.org
-Country: GB Great Britain
+Country: GB United Kingdom
 Location: London
-Comment: 100 Mbit link
+Bandwidth: 100 Mbps
 IPv6: no
 
-Site: ftp.lug.udel.edu
+Site: mirror.lug.udel.edu
 Type: leaf
-Archive-architecture: amd64 hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 powerpc sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-ftp: /pub/debian/
 Archive-http: /pub/debian/
 Archive-rsync: pub/debian/
@@ -1696,14 +1669,27 @@
 Comment: limited to 10Mbps (100Mbps?), also on I2
 IPv6: no
 
+Site: rsync.lug.udel.edu
+Type: leaf
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
+Archive-rsync: debian/
+Archive-upstream: ftp.ndlug.nd.edu
+Maintainer: Bryan Seitz <seitz@lug.udel.edu>
+Country: US United States
+Location: Newark, Delaware
+Sponsor: University of Delaware http://www.udel.edu/
+Sponsor: University of Delaware Linux Users Group http://www.lug.udel.edu/
+Comment: limited to 10Mbps (100Mbps?), also on I2
+IPv6: no
+
 Site: ftp.rediris.es
 Type: leaf
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-ftp: /debian/
 Archive-http: /debian/
 Archive-upstream: ftp.es.debian.org
-CDImage-ftp: /mirror/debian-cd/
-CDImage-http: /debian-cd/
+X-CDImage-ftp: /mirror/debian-cd/
+X-CDImage-http: /debian-cd/
 Maintainer: Jose Manuel Macias Luna <jmanuel.macias@rediris.es>, ftp@rediris.es
 Country: ES Spain
 Location: Madrid
@@ -1712,7 +1698,7 @@
 
 Site: download.unesp.br
 Type: leaf
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-http: /linux/debian/
 Archive-upstream: ftp.egr.msu.edu
 NonUS-http: /linux/debian-non-US/
@@ -1721,16 +1707,16 @@
 Country: BR Brazil
 Location: S&atilde;o Paulo
 Sponsor: University of Sao Paulo State - AI http://www.unesp.br/ai
-IPv6: no
+IPv6: yes
 
 Site: mirror.pacific.net.au
 Type: leaf
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
-Archive-ftp: /debian/
-Archive-http: /debian/
-Archive-upstream: ftp.au.debian.org
-CDImage-ftp: /debian-cd/
-CDImage-http: /debian-cd/
+X-Archive-architecture: amd64 armel hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+X-Archive-ftp: /debian/
+X-Archive-http: /debian/
+X-Archive-upstream: ftp.au.debian.org
+X-CDImage-ftp: /debian-cd/
+X-CDImage-http: /debian-cd/
 Maintainer: mirror-team@pacific.net.au
 Country: AU Australia
 Location: Sydney
@@ -1741,7 +1727,7 @@
 Site: debian.lcs.mit.edu
 Alias: debian.csail.mit.edu
 Type: Push-Primary
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-ftp: /debian/
 Archive-http: /debian/
 Archive-rsync: debian/
@@ -1754,7 +1740,7 @@
 
 Site: ftp.u-picardie.fr
 Type: Push-Secondary
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-ftp: /mirror/debian/
 Archive-http: /mirror/debian/
 Archive-upstream: ftp.fr.debian.org
@@ -1767,12 +1753,12 @@
 Site: ftp.belnet.be
 Volatile-upstream: kassia.debian.org
 Type: Push-Secondary
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-ftp: /debian/
 Archive-http: /debian/
 Archive-rsync: debian/
 CDImage-ftp: /debian-cd/
-CDImage-http: /debian-cd/
+X-CDImage-http: /debian-cd/
 CDImage-rsync: debian-cd/
 Volatile-http: /packages/debian-volatile/
 Volatile-ftp: /packages/debian-volatile/
@@ -1786,7 +1772,7 @@
 
 Site: ftp.surfnet.nl
 Type: leaf
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-ftp: /pub/os/Linux/distr/debian/
 Archive-http: /os/Linux/distr/debian/
 Archive-upstream: ftp.nl.debian.org
@@ -1797,22 +1783,22 @@
 IPv6: yes
 
 Site: debian.mirrors.easynet.fr
-Alias: tengu.easynet.fr
 Type: leaf
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf i386 ia64 kfreebsd-amd64 kfreebsd-i386 powerpc s390x sparc
 Archive-ftp: /debian/
-Archive-http: /
+Archive-http: /debian/
 Archive-upstream: ftp.fr.debian.org
-Maintainer: S. Barbereau <ftpmaster@easynet.fr>, Sebastien J. Gross <sjg@debian.org>
+Maintainer: Y. Augustin <ftpmaster@easynet.fr>
 Country: FR France
 Location: Paris
 Sponsor: Easynet http://www.easynet.fr/
 IPv6: no
+Bandwidth: 100Mbps
 
 Site: ftp.debian.nl
 Alias: download.xs4all.nl
 Type: leaf
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-ftp: /debian/
 Archive-http: /debian/
 Archive-upstream: ftp.nl.debian.org
@@ -1820,11 +1806,12 @@
 Country: NL Netherlands
 Location: Amsterdam
 Sponsor: XS4ALL/KPN http://www.xs4all.nl/
+Bandwidth: 1Gbps
 IPv6: no
 
 Site: www.zentek-international.com
 Type: leaf
-X-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+X-Archive-architecture: amd64 armel hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
 X-Archive-http: /mirrors/debian/
 Archive-upstream: ftp.kr.debian.org
 Maintainer: Jason Lim <jcl@zentek-international.com>, support@zentek-international.com
@@ -1837,7 +1824,7 @@
 
 Site: ftp.u-strasbg.fr
 Type: Push-Secondary
-Archive-architecture: alpha amd64 armel hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 powerpc sparc
+Archive-architecture: amd64 hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 powerpc
 Archive-ftp: /debian/
 Archive-http: /debian/
 Archive-upstream: ftp.fr.debian.org
@@ -1845,6 +1832,7 @@
 NonUS-http: /debian-non-US/
 Maintainer: Guy Brand <guybrand@chimie.u-strasbg.fr>, ftpmaint@crc.u-strasbg.fr
 Country: FR France
+Comment: Guy Brand's address bounces
 Sponsor: Universite Louis Pasteur, Strasbourg http://www.u-strasbg.fr/
 Sponsor: Transtec http://www.transtec.fr/
 IPv6: yes
@@ -1853,7 +1841,7 @@
 Alias: surabaya.vlsm.org
 Alias: katmai.its.ac.id
 Type: leaf
-Archive-architecture: amd64 hurd-i386 i386 powerpc
+Archive-architecture: amd64 armhf i386 kfreebsd-amd64 kfreebsd-i386 s390x
 Archive-ftp: /debian/
 Archive-http: /debian/
 Archive-upstream: kambing.ui.ac.id
@@ -1865,9 +1853,20 @@
 IPv6: no
 
 Site: ftp.br.debian.org
-Alias: debian.c3sl.ufpr.br
+Includes: debian.c3sl.ufpr.br
+Type: Push-Primary
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
+Archive-ftp: /debian/
+Archive-http: /debian/
+Archive-rsync: debian/
+Archive-upstream: syncproxy.wna.debian.org
+Archive-method: push
+Country: BR Brazil
+IPv6: yes
+
+Site: debian.c3sl.ufpr.br
 Type: Push-Primary
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-ftp: /debian/
 Archive-http: /debian/
 Archive-rsync: debian/
@@ -1878,7 +1877,7 @@
 Backports-rsync: debian-backports/
 Backports-upstream: syncproxy3.eu.debian.org
 Backports-method: push
-CDImage-ftp: /debian-cd/
+X-CDImage-ftp: /debian-cd/
 CDImage-http: /debian-cd/
 CDImage-rsync: debian-cd/
 Volatile-ftp: /debian-volatile/
@@ -1894,11 +1893,11 @@
 Location: Curitiba, Paran&aacute;
 Sponsor: Center for Scientific Computing and Free Software (C3SL) http://www.c3sl.ufpr.br/
 Sponsor: Universidade Federal do Paran&aacute; http://www.ufpr.br/
-IPv6: no
+IPv6: yes
 
 Site: ftp.carnet.hr
 Type: Push-Secondary
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-ftp: /debian/
 Archive-http: /debian/
 Archive-upstream: debian.carnet.hr
@@ -1914,8 +1913,9 @@
 
 Site: ftp.nl.debian.org
 Alias: ftp.snt.utwente.nl
+Alias: debian.snt.utwente.nl
 Type: Push-Primary
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-ftp: /debian/
 Archive-http: /debian/
 Archive-rsync: debian/
@@ -1928,7 +1928,7 @@
 NonUS-ftp: /debian-non-US/
 NonUS-http: /debian-non-US/
 NonUS-rsync: debian-non-US/
-CDImage-ftp: /debian-cd/
+X-CDImage-ftp: /debian-cd/
 CDImage-http: /debian-cd/
 CDImage-rsync: debian-cd/
 Old-ftp: /debian-archive/
@@ -1947,12 +1947,26 @@
 Location: Enschede
 Sponsor: Studenten Net Twente http://www.snt.utwente.nl/
 Sponsor: University of Twente http://www.utwente.nl/
-IPv6: no
+IPv6: yes
 X-Comment: still has debian-amd64
 
+Site: mirror.proserve.nl
+Type: leaf
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
+Archive-ftp: /debian/
+Archive-http: /debian/
+IPv6: yes
+Archive-upstream: ftp.nl.debian.org
+Updates: four
+Maintainer: Maarten van der Ster <mvdster@proserve.nl>, Edwin van Vliet <evvliet@proserve.nl>
+Country: NL Netherlands
+Location: Alblasserdam, Netherlands
+Sponsor: Proserve http://www.proserve.nl
+Bandwidth: 2GBps
+
 Site: ftp.iinet.net.au
 Type: leaf
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-ftp: /debian/debian/
 Archive-http: /debian/debian/
 Archive-upstream: ftp.au.debian.org
@@ -1972,51 +1986,42 @@
 Sponsor: iiNet Limited http://www.iinet.net.au/
 IPv6: no
 
-Site: www.hk.debian.org
-Alias: www.debian.org.hk
-Alias: debian.org.hk
-Type: Push-Secondary
-WWW-http: /
-WWW-upstream: www.jp.debian.org
-Maintainer: Roy Hiu-yeung Chan <hychan@debian.org.hk>, Anthony Wong <ypwong@debian.org.hk>, ypwong@gmail.com, Roy Hiu-yeung Chan <roy.the.geek@gmail.com>
-Country: HK Hong Kong
-Location: Hong Kong
-Sponsor: Hong Kong Debian enthusiasts http://www.debian.org.hk/
-IPv6: no
-
 Site: debian.balt.net
 Type: leaf
-Archive-architecture: amd64 arm armel i386 sparc
+Archive-architecture: amd64 i386
 Archive-ftp: /debian/
 Archive-http: /debian/
-Archive-rsync: debian/
-Archive-upstream: ftp.fi.debian.org
-Maintainer: Evaldas Darcianovas <evaldas@balt.net>
+Archive-upstream: ftp.nl.debian.org
+Backports-ftp: /debian-backports/
+Backports-http: /debian-backports/
+Backports-upstream: ftp.nl.debian.org
+Maintainer: Evaldas Darcianovas <evaldas@balt.net>, Baltnetos Komunikacijos <hostmaster@balt.net>
 Country: LT Lithuania
 Location: Vilnius
 Sponsor: JSC Baltnetos Komunikacijos http://www.balt.net/
-Updates: once (1:00AM GMT+2)
+Bandwidth: 1Gbps
+Updates: four
 Comment: will add some more architectures on demand
 IPv6: no
 
 Site: linux.csua.berkeley.edu
 Alias: screwdriver.csua.berkeley.edu
 Type: leaf
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
-Archive-http: /debian/
-Archive-rsync: debian/
+Archive-architecture: amd64 i386
+X-Archive-http: /debian/
+X-Archive-rsync: debian/
 Archive-upstream: ftp-osl.osuosl.org
 Maintainer: CSUA System Administrators <root@CSUA.Berkeley.EDU>
 Country: US United States
 Location: Berkeley, California
 Sponsor: UC Berkeley Computer Science Undergraduate Association http://www.csua.berkeley.edu/
 IPv6: no
-Comment: 10Mbps
+Bandwidth: 10Mbps
 
 Site: ftp.fu-berlin.de
 Alias: Hefe.ZEDAT.FU-Berlin.DE
 Type: leaf
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-ftp: /pub/unix/linux/mirrors/debian/
 Archive-upstream: ftp.de.debian.org
 Maintainer: ftp-adm@FU-Berlin.DE
@@ -2027,7 +2032,7 @@
 
 Site: ftp.funet.fi
 Type: leaf
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-ftp: /pub/linux/mirrors/debian/
 Archive-http: /pub/linux/mirrors/debian/
 Archive-rsync: ftp/pub/linux/mirrors/debian/
@@ -2044,35 +2049,15 @@
 Sponsor: Finnish University and Research network FUNET http://www.funet.fi/
 IPv6: yes
 
-Site: debian.c3sl.ufpr.br
-Type: Push-Primary
-WWW-http: /
-WWW-upstream: www-master.debian.org
-Maintainer: Carlos Carvalho <carlos@fisica.ufpr.br>, Marcos Castilho <marcos@inf.ufpr.br>, treco@inf.ufpr.br, root@c3sl.ufpr.br
-Country: BR Brazil
-Location: Curitiba, Paran&aacute;
-Sponsor: Center for Scientific Computing and Free Software (C3SL) http://www.c3sl.ufpr.br/
-Sponsor: Universidade Federal do Paran&aacute; http://www.ufpr.br/
-IPv6: no
-
-Site: www.id.debian.org
-Alias: debianx.vlsm.org
-Type: Push-Primary
-WWW-http: /
-WWW-upstream: www-master.debian.org
-Maintainer: Gladhi Guarddin <adin@ui.ac.id>, kontak@kambing.ui.ac.id
-Location: Depok
-Country: ID Indonesia
-Sponsor: vLSM.org http://www.vlsm.org/
-Sponsor: Computer Science Center, University of Indonesia at Lenteng Agung http://www.ui.edu/
-IPv6: no
-
 Site: kambing.ui.ac.id
-Type: Leaf 
-Archive-architecture: amd64 i386 ia64 sparc
+Type: Leaf
+Archive-architecture: amd64 armel armhf i386 ia64 mips s390x sparc
 Archive-ftp: /debian/
 Archive-http: /debian/
-Archive-upstream: ftp.au.debian.org
+Archive-upstream: ftp.jp.debian.org
+CDImage-ftp: /iso/debian/
+CDImage-http: /iso/debian/
+CDImage-rsync: iso/debian/
 Maintainer: Gladhi Guarddin <adin@ui.ac.id>, kontak@kambing.ui.ac.id
 Location: Depok
 Country: ID Indonesia
@@ -2082,7 +2067,7 @@
 
 Site: debian.iskon.hr
 Type: leaf
-Archive-architecture: amd64 hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 s390
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-ftp: /debian/
 Archive-http: /debian/
 NonUS-ftp: /debian-non-US/
@@ -2096,7 +2081,7 @@
 
 Site: debian.tu-bs.de
 Type: Push-Secondary
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-ftp: /debian/
 Archive-http: /debian/
 Archive-rsync: debian/
@@ -2110,7 +2095,7 @@
 
 Site: ftp.uni-koeln.de
 Type: leaf
-Archive-architecture: alpha amd64 i386 kfreebsd-amd64 kfreebsd-i386 powerpc sparc
+Archive-architecture: amd64 armel armhf i386
 Archive-ftp: /debian/
 Archive-http: /debian/
 Archive-upstream: ftp.de.debian.org
@@ -2118,7 +2103,7 @@
 Country: DE Germany
 Location: K&ouml;ln
 Sponsor: RRZ Universit&auml;t K&ouml;ln http://www.uni-koeln.de/RRZK/
-Comment: 155Mbit/s
+Bandwidth: 155Mbit/s
 IPv6: no
 
 Site: debian.nsu.ru
@@ -2127,6 +2112,7 @@
 Archive-ftp: /debian/
 Archive-http: /debian/
 Archive-upstream: ftp.de.debian.org
+Backports-architecture: amd64 i386
 Backports-ftp: /debian-backports/
 Backports-http: /debian-backports/
 Backports-upstream: www.backports.org
@@ -2142,9 +2128,18 @@
 IPv6: no
 
 Site: ftp.is.debian.org
-Alias: ftp.rhnet.is
+Includes: debian.simnet.is
+Type: Push-Secondary
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
+Archive-ftp: /debian/
+Archive-http: /debian/
+Archive-rsync: debian/
+Archive-upstream: ftp.se.debian.org
+Country: IS Iceland
+
+Site: ftp.rhnet.is
 Type: Push-Secondary
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-ftp: /debian/
 Archive-http: /debian/
 Archive-rsync: debian/
@@ -2158,7 +2153,7 @@
 
 Site: ftp.debian.skynet.be
 Type: leaf
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-ftp: /debian/
 Archive-http: /ftp/debian/
 Archive-upstream: ftp.nl.debian.org
@@ -2177,58 +2172,46 @@
 
 Site: debian.secsup.org
 Type: leaf
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
-Archive-ftp: /pub/linux/debian/
-Archive-http: /
+Archive-architecture: amd64 armel hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+X-Archive-ftp: /pub/linux/debian/
+X-Archive-http: /
 Archive-upstream: rsync.osuosl.org
 Maintainer: ftp@secsup.org
 Country: US United States
 Sponsor: UUNET Customer Security Support http://mirrors.secsup.org/
+Comment: NXDOMAIN
 IPv6: yes
 
 Site: ftp.tu-graz.ac.at
 Alias: ftp.tugraz.at
 Type: leaf
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-ftp: /mirror/debian/
 Archive-http: /mirror/debian/
 Archive-upstream: ftp.at.debian.org
 Maintainer: Mario Lang <lang@ZID.TUGraz.at>
+Comment: maintainer address bounces
 Country: AT Austria
 Location: Graz
 Sponsor: ZID der Technische Universit&auml;t Graz http://www.zid.tugraz.at/
 IPv6: no
 
-Site: linux.org.by
-Type: leaf
-Archive-architecture: amd64 i386
-Archive-ftp: /debian/
-Archive-http: /debian/
-Archive-upstream: ftp.de.debian.org
-NonUS-ftp: /debian-non-US/
-NonUS-http: /debian-non-US/
-Maintainer: Andrei Darashenka <adorosh2@it.org.by>
-Country: BY Belarus
-Location: Minsk
-Sponsor: BAS-NET http://www.bas-net.by/
-IPv6: no
-
 Site: ftp.mpi-sb.mpg.de
 Type: leaf
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armhf i386 kfreebsd-amd64 kfreebsd-i386 s390x
 Archive-ftp: /pub/linux/debian/
 Archive-upstream: ftp.de.debian.org
-CDImage-ftp: /pub/linux/distributions/debian/debian-cd/
+X-CDImage-ftp: /pub/linux/distributions/debian/debian-cd/
 Maintainer: Wolfram Wagner <ftpadmin@mpi-sb.mpg.de>
 Country: DE Germany
 Location: Saarbr&uuml;cken
 Sponsor: Max-Planck-Institut f&uuml;r Informatik http://www.mpi-sb.mpg.de/
-Comment: 34MBit uplink to DFN
+Bandwidth: 34MBit uplink to DFN
 IPv6: no
 
 Site: ftp.tiscali.nl
 Type: leaf
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-ftp: /pub/mirrors/debian/
 Archive-http: /debian/
 Archive-rsync: debian/
@@ -2238,12 +2221,13 @@
 Backports-upstream: ftp.nl.debian.org
 Security-rsync: debian-security/
 Security-ftp: /pub/mirrors/debian-security/
-Security-http: /debian-security/
+Security-http: /pub/mirrors/debian-security/
 Security-rsync: debian-security/
-Volatile-http: /debian-volatile/
+Volatile-http: /pub/mirrors/debian-volatile/
 Volatile-ftp: /pub/mirror/debian-volatile/
 Volatile-rsync: debian-volatile/
 Maintainer: Edward Tjin Liep Shie <edwardtls@tiscali.nl>, Support@tiscali.nl
+Comment: maintainer address bounces
 Country: NL Netherlands
 Location: Amsterdam
 Sponsor: Tiscali Nederland http://www.tiscali.nl/
@@ -2251,11 +2235,11 @@
 
 Site: ftp.zcu.cz
 Type: leaf
-Archive-architecture: amd64 i386 kfreebsd-amd64 kfreebsd-i386
+Archive-architecture: amd64 armhf i386 kfreebsd-amd64 kfreebsd-i386 s390x
 Archive-ftp: /mirrors/debian/
 Archive-http: /mirrors/debian/
-CDImage-ftp: /pub/linux/debian-cd/
-CDImage-http: /pub/linux/debian-cd/
+X-CDImage-ftp: /pub/linux/debian-cd/
+X-CDImage-http: /pub/linux/debian-cd/
 Archive-upstream: ftp.cz.debian.org
 Maintainer: Milos Wimmer <wimmer@zcu.cz>
 Country: CZ Czech Republic
@@ -2266,7 +2250,7 @@
 Site: ftp.jyu.fi
 Alias: lennon.cc.jyu.fi
 Type: leaf
-Archive-architecture: alpha amd64 hurd-i386 i386 powerpc sparc
+Archive-architecture: amd64 hurd-i386 i386 powerpc sparc
 Archive-ftp: /debian/
 Archive-http: /debian/
 Archive-upstream: ftp.fi.debian.org
@@ -2294,7 +2278,7 @@
 Site: ftp.gr.debian.org
 Alias: ftp.ntua.gr
 Type: Push-Primary
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-ftp: /debian/
 Archive-http: /debian/
 Archive-rsync: debian/
@@ -2311,16 +2295,17 @@
 Country: GR Greece
 Location: Athens
 Sponsor: National Technical University of Athens http://www.ntua.gr/
-Comment: 1Gbps uplink connection
+Bandwidth: 1Gbps
 IPv6: yes
 
 Site: debian.osuosl.org
+Includes: ftp-nyc.osuosl.org ftp-chi.osuosl.org
 Alias: debian.oregonstate.edu
 Alias: ftp.oregonstate.edu
 Alias: ftp.osuosl.org
 Type: Push-Primary
 Archive-ftp: /debian/
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-http: /debian/
 CDImage-ftp: /debian-cdimage/
 CDImage-http: /debian-cdimage/
@@ -2329,28 +2314,55 @@
 Country: US United States
 Location: Corvallis, Oregon
 Sponsor: OSU Open Source Lab http://www.osuosl.org/
-Comment: for rsync see rsync.osuosl.org
 IPv6: no
 
-Site: rsync.osuosl.org
+Site: ftp-nyc.osuosl.org
 Type: Push-Primary
-Archive-rsync: debian/
+Archive-ftp: /debian/
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
+Archive-http: /debian/
+CDImage-ftp: /debian-cdimage/
+CDImage-http: /debian-cdimage/
 Archive-upstream: syncproxy.wna.debian.org
 Maintainer: support@osuosl.org
 Country: US United States
-Location: Corvallis, Oregon
+Location: New York
 Sponsor: OSU Open Source Lab http://www.osuosl.org/
-Sponsor: Oregon State University http://www.net.oregonstate.edu/
-Comment: only for other mirrors
 IPv6: no
 
-Site: debian.csie.ntu.edu.tw
-Type: leaf
-Archive-architecture: amd64 hurd-i386 i386
-Archive-ftp: /pub/debian/
+Site: ftp-chi.osuosl.org
+Type: Push-Primary
+Archive-ftp: /debian/
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
+Archive-http: /debian/
+CDImage-ftp: /debian-cdimage/
+CDImage-http: /debian-cdimage/
+Archive-upstream: syncproxy.wna.debian.org
+Maintainer: support@osuosl.org
+Country: US United States
+Location: Corvallis, Oregon
+Sponsor: OSU Open Source Lab http://www.osuosl.org/
+IPv6: no
+
+Site: rsync.osuosl.org
+Type: Push-Primary
+Archive-rsync: debian/
+Archive-upstream: syncproxy.wna.debian.org
+Maintainer: support@osuosl.org
+Country: US United States
+Location: Corvallis, Oregon
+Sponsor: OSU Open Source Lab http://www.osuosl.org/
+Sponsor: Oregon State University http://www.net.oregonstate.edu/
+Comment: only for other mirrors
+IPv6: no
+
+Site: debian.csie.ntu.edu.tw
+Type: leaf
+Archive-architecture: amd64 armhf i386 s390x
+Archive-ftp: /pub/debian/
 Archive-http: /debian/
 Archive-upstream: ftp.tw.debian.org
-Maintainer: Tsung-Hsiang Chang <vgod@CirX.org>, ftpadm@phoenix.csie.ntu.edu.tw
+Maintainer: Tsung-Hsiang Chang <vgod@CirX.org>, ftpadm@csie.ntu.edu.tw
 Country: TW Taiwan
 Sponsor: CSIE, National Taiwan University http://www.csie.ntu.edu.tw/
 IPv6: no
@@ -2358,7 +2370,7 @@
 Site: sft.if.usp.br
 Alias: fma.if.usp.br
 Type: Push-Secondary
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-http: /debian/
 Archive-rsync: debian/
 Backports-ftp: /debian-backports/
@@ -2378,12 +2390,12 @@
 Location: Sao Paulo
 Sponsor: Department of Mathematical Physics http://www.fma.if.usp.br/
 Sponsor: Institute for Physics, University of Sao Paulo http://www.if.usp.br/
-Comment: Connectivity is 1 Gbps. FTP and NFS available by request.
+Bandwidth: 1Gbps
 IPv6: no
 
 Site: debian.cict.fr
 Type: leaf
-Archive-architecture: amd64 arm armel hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386
+Archive-architecture: amd64 armel armhf hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 s390x
 Archive-ftp: /debian/
 Archive-http: /debian/
 Archive-upstream: ftp.fr.debian.org
@@ -2396,8 +2408,8 @@
 
 Site: mirror.cict.fr
 Type: leaf
-CDImage-ftp: /debian-cd/
-CDImage-http: /debian-cd/
+X-CDImage-ftp: /debian-cd/
+X-CDImage-http: /debian-cd/
 CDImage-upstream: ftp.de.debian.org
 Security-ftp: /debian-security/
 Security-http: /debian-security/
@@ -2408,33 +2420,32 @@
 Sponsor: Universit&eacute; Paul Sabatier http://www.iut-tlse3.fr/
 IPv6: no
 
-Site: mirror.ovh.net
-Includes: mir2.ovh.net mir1.ovh.net
+Site: debian.mirrors.ovh.net
 Type: leaf
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-ftp: /debian/
 Archive-http: /debian/
 Archive-upstream: debian.proxad.net
-Volatile-ftp: /volatile/
-Volatile-http: /volatile/
-Volatile-upstream: volatile.debian.org
+X-Volatile-ftp: /debian-volatile/
+X-Volatile-http: /debian-volatile/
+X-Volatile-upstream: volatile.debian.org
 IPv6: yes
 Maintainer: Felix Krohn <mirror@ovh.net>
 Country: FR France
 Location: Roubaix, France
 Sponsor: OVH http://www.ovh.com/welcome/
-Comment: 2GBit bandwidth, unlimited traffic
+Bandwidth: 2GBps
 
 Site: ftp.twaren.net
 Alias: linux.cdpa.nsysu.edu.tw
 Type: Push-Secondary
-Archive-ftp: /debian/
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
-Archive-http: /debian/
+X-Archive-ftp: /debian/
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
+X-Archive-http: /debian/
 CDImage-ftp: /Linux/Debian/debian-cd/
 CDImage-http: /Linux/Debian/debian-cd/
-Old-ftp: /Linux/Debian/debian-archive/
-Old-http: /Linux/Debian/debian-archive/
+X-Old-ftp: /Linux/Debian/debian-archive/
+X-Old-http: /Linux/Debian/debian-archive/
 Archive-upstream: ftp.tw.debian.org
 Maintainer: TWAREN FTP <ftpadmin@twaren.net>
 Country: TW Taiwan
@@ -2445,7 +2456,7 @@
 
 Site: mirror.anl.gov
 Type: leaf
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-ftp: /pub/debian/
 Archive-http: /debian/
 Archive-upstream: ftp.egr.msu.edu
@@ -2454,38 +2465,59 @@
 Location: Chicago, Illinois
 Sponsor: Argonne National Laboratory http://www.anl.gov/
 Comment: This is a complete mirror, connected by Gigabit.
-IPv6: no
+Bandwidth: 10Gbps
+IPv6: yes
 
 Site: linorg.usp.br
 Type: leaf
 Archive-ftp: /debian/
-Archive-architecture: i386 kfreebsd-amd64 kfreebsd-i386
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-http: /debian/
-CDImage-ftp: /iso/debian/
-CDImage-http: /iso/debian/
+X-CDImage-ftp: /iso/debian/
+X-CDImage-http: /iso/debian/
 Archive-upstream: ftp.br.debian.org
 Maintainer: linorg@usp.br
 Country: BR Brazil
 Location: Sao Paulo
 Sponsor: Centro de Computacao Eletronica, Universidade de Sao Paulo http://www.usp.br/cce/
-IPv6: no
+IPv6: yes
 
-Site: koyanet.lv
-Alias: ftp.koyanet.lv
+Site: debian.koyanet.lv
+Aliases: koyanet.lv
+Aliases: ftp.koyanet.lv
+Aliases: saule.koyanet.lv
 Type: leaf
-Archive-architecture: amd64 i386
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-ftp: /debian/
 Archive-http: /debian/
-Archive-upstream: ftp.pl.debian.org
-Maintainer: Aigarius Mahinovs <aigarius@debian.org>
+Archive-rsync: debian/
+Archive-upstream: ftp.de.debian.org
+Backports-ftp: /debian-backports/
+Backports-http: /debian-backports/
+Backports-rsync: debian-backports/
+Backports-upstream: ftp.ch.debian.org
+CDImage-ftp: /debian-cd/
+CDImage-http: /debian-cd/
+CDImage-rsync: debian-cd/
+CDImage-upstream: ftp.de.debian.org
+Volatile-ftp: /debian-volatile/
+Volatile-http: /debian-volatile/
+Volatile-rsync: debian-volatile/
+Volatile-upstream: ftp.de.debian.org
+Old-ftp: /debian-archive/
+Old-http: /debian-archive/
+Old-rsync: debian-archive/
+Old-upstream: archive.debian.org
+IPv6: no
+Maintainer: Artis Steinbergs <artis@steinbergs.lv>
 Country: LV Latvia
 Location: Riga
 Sponsor: Riga Technical University http://www.rtu.lv/
-IPv6: no
+Comment: 1Gbps to Latvia, 1,25Gb/s via GEANT
 
 Site: ftp.nerim.net
 Type: Push-Secondary
-Archive-architecture: i386
+Archive-architecture: amd64 armhf i386 s390x
 Archive-ftp: /debian/
 Archive-http: /debian/
 Archive-upstream: ftp.fr.debian.org
@@ -2493,31 +2525,34 @@
 Country: FR France
 Location: Paris
 Sponsor: Nerim http://www.nerim.net/
-Comment: 100 Mbps bandwidth
+Bandwidth: 100 Mbps
 IPv6: yes
 
 Site: debian.osdn.org.ua
 Type: leaf
-Archive-architecture: i386 kfreebsd-amd64 kfreebsd-i386
+Archive-architecture: armhf amd64 i386 s390x
 Archive-ftp: /pub/Debian/debian/
 Archive-http: /debian/
 Archive-rsync: debian/
-NonUS-ftp: /pub/Debian/debian-non-US/
-NonUS-http: /debian-non-US/
-NonUS-rsync: debian-non-US/
-Archive-upstream: ftp.de.debian.org
+Security-architecture: amd64 i386
+Security-ftp: /pub/Debian/debian-security/
+Security-http: /debian-security/
+Security-rsync: debian-security/
+Archive-upstream: ftp.ua.debian.org
+Security-upstream: ftp.ua.debian.org
 Maintainer: Dmitry Astapov <adept@osdn.org.ua>
 Country: UA Ukraine
 Location: Kiev
 Updates: once (01:00 EET)
 Comment: Available to .ua only.
+Bandwidth: 1Gbps
 IPv6: no
 
 Site: ftp.tu-chemnitz.de
 Type: leaf
 Archive-ftp: /pub/linux/debian/debian/
 Archive-http: /pub/linux/debian/debian/
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 CDImage-ftp: /pub/linux/debian/debian-cd/
 NonUS-ftp: /pub/linux/debian/debian-non-US/
 Archive-upstream: ftp.de.debian.org
@@ -2531,13 +2566,13 @@
 Alias: debian.lyildirim.net
 Type: Push-Secondary
 Archive-ftp: /debian/
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-http: /debian/
 Archive-rsync: debian/
 Archive-upstream: ftp.de.debian.org
 CDImage-ftp: /debian-cd/
 CDImage-http: /debian-cd/
-CDImage-rsync: debian-cd/
+X-CDImage-rsync: debian-cd/
 CDImage-upstream: cdimage.debian.org
 Volatile-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
 Volatile-http: /debian-volatile/
@@ -2552,13 +2587,13 @@
 Country: TR Turkey
 Location: Ankara
 Sponsor: Ankara University http://www.ankara.edu.tr/
-IPv6: no
+IPv6: yes
 
 Site: ftp.sun.ac.za
 Type: leaf
-Archive-architecture: amd64 i386 kfreebsd-amd64 kfreebsd-i386
-Archive-ftp: /debian/
-Archive-http: /ftp/debian/
+Archive-architecture: amd64 armhf i386 s390x
+X-Archive-ftp: /debian/
+X-Archive-http: /ftp/debian/
 X-CDImage-ftp: /iso-images/debian/
 X-CDImage-http: /ftp/iso-images/debian/
 Archive-upstream: ftp.de.debian.org
@@ -2567,12 +2602,13 @@
 Location: Stellenbosch
 Sponsor: University of Stellenbosch http://www.sun.ac.za/
 X-Comment: outdated ISO ; spaillar 2007/04/07
+X-Comment: broken script, see #612774: ftp.sun.ac.za not consistent
 IPv6: no
 
 Site: ftp.psn.ru
 Alias: server.psn.ru
 Type: leaf
-Archive-architecture: alpha amd64 hurd-i386 i386
+Archive-architecture: amd64 armel hurd-i386 i386
 Archive-ftp: /debian/
 Archive-http: /debian/
 Archive-rsync: debian/
@@ -2585,16 +2621,17 @@
 CDImage-http: /debian-cd/
 CDImage-rsync: debian-cd/
 Maintainer: Ilya Ovchinnikov <ilya@psn.ru>, ftpmaster@psn.ru
+Comment: ftpmaster address bounces
 Country: RU Russia
 Location: Pushchino, Moscow Region
 Sponsor: Pushchino Scientific Center http://www.psn.ru/
 Updates: once
-IPv6: no
+IPv6: yes
 
 Site: debian.ludost.net
 Alias: marla.ludost.net
 Type: Push-Secondary
-Archive-architecture: i386
+Archive-architecture: amd64 i386
 Archive-ftp: /debian/
 Archive-http: /debian/
 Archive-upstream: ftp.se.debian.org
@@ -2605,37 +2642,26 @@
 Location: Sofia
 Sponsor: Lirex Net http://www.lirex.net/
 Sponsor: Ludost.net http://www.ludost.net/
-IPv6: no
+IPv6: yes
 
 Site: debian.virginmedia.com
 Alias: mirror2.blueyonder.co.uk debian.blueyonder.co.uk
 Type: leaf
-X-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+X-Archive-architecture: amd64 armel hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
 X-Archive-ftp: /mirrors/ftp.debian.org
 X-Archive-http: /
 X-Archive-upstream: ftp.nl.debian.org
 CDImage-ftp: /mirrors/debian-cd/
 Maintainer: Alan Gordon <alan.gordon@virginmedia.co.uk>
-Country: GB Great Britain
+Country: GB United Kingdom
 Location: London, Heathrow
 Sponsor: blueyonder (Telewest Broadband) http://www.blueyonder.co.uk/
 Updates: once
 IPv6: no
 
-Site: sluglug.ucsc.edu
-Type: leaf
-Archive-architecture: amd64 i386
-Archive-http: /debian/
-Archive-upstream: mirrors.kernel.org
-Maintainer: Ignacio Solis <mirrormanager@sluglug.ucsc.edu>
-Country: US United States
-Location: Santa Cruz, California
-Sponsor: UC Santa Cruz http://www.ucsc.edu/
-IPv6: no
-
 Site: mi.mirror.garr.it
 Type: leaf
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-ftp: /mirrors/debian/
 Archive-http: /mirrors/debian/
 Archive-rsync: debian/
@@ -2649,7 +2675,7 @@
 Country: IT Italy
 Location: Milano
 Sponsor: GARR/CILEA http://mirror.garr.it/
-IPv6: no
+IPv6: yes
 
 Site: ftp.uni-kl.de
 Type: Push-Secondary
@@ -2668,9 +2694,20 @@
 IPv6: yes
 
 Site: ftp.hr.debian.org
-Alias: debian.carnet.hr
+Includes: debian.carnet.hr
+Type: Push-Primary
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
+Archive-http: /debian/
+Archive-ftp: /debian/
+Archive-rsync: debian/
+Archive-upstream: kassia.debian.org
+Country: HR Croatia
+IPv6: yes
+
+Site: debian.carnet.hr
+Alias: arrakis.carnet.hr
 Type: Push-Primary
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-http: /debian/
 Archive-ftp: /debian/
 Archive-rsync: debian/
@@ -2688,7 +2725,7 @@
 
 Site: ftp.univie.ac.at
 Type: leaf
-Archive-architecture: i386 kfreebsd-amd64 kfreebsd-i386
+Archive-architecture: armel
 Archive-ftp: /systems/linux/debian/debian/
 Archive-http: /systems/linux/debian/debian/
 Archive-upstream: ftp.de.debian.org
@@ -2698,14 +2735,14 @@
 Country: AT Austria
 Location: Wien
 Sponsor: ZID der Universit&auml;t Wien http://www.univie.ac.at/ZID/
-IPv6: no
+IPv6: yes
 
 Site: ftp.mx.debian.org
 Alias: debian.unam.mx
 Alias: nisamox.fciencias.unam.mx
 Type: Push-Primary
 Archive-ftp: /debian/
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-http: /debian/
 Archive-rsync: debian/
 Archive-upstream: syncproxy.wna.debian.org
@@ -2715,12 +2752,13 @@
 Comment: NFS access can be obtained if you are inside an academic institution
  in MEXICO; hard disk donations are very welcome, please email
  webmaster@nisamox.fciencias.unam.mx
+Bandwidth: 100Mbps
 IPv6: no
 
 Site: iso.linux.hr
 Type: leaf
-CDImage-ftp: /debian/
-CDImage-http: /debian/
+X-CDImage-ftp: /debian/
+X-CDImage-http: /debian/
 CDImage-upstream: ftp.hr.debian.org
 CDImage-architecture: amd64 i386
 Maintainer: Josip Rodin <ftpadmin@linux.hr>
@@ -2731,27 +2769,35 @@
 
 Site: mirror.positive-internet.com
 Type: Push-Secondary
-Archive-architecture: amd64 hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 powerpc sparc
+Archive-architecture: amd64 armhf i386 ia64 kfreebsd-amd64 kfreebsd-i386 powerpc s390x sparc
 Archive-ftp: /debian/
 Archive-http: /debian/
 Archive-upstream: ftp.uk.debian.org
 Maintainer: Stephen Harker <stephen@positive-internet.com>
-Country: GB Great Britain
+Country: GB United Kingdom
 Location: London
 Sponsor: The Positive Internet Company http://www.positive-internet.com/
 IPv6: no
 
 Site: ftp.bme.hu
 Type: leaf
-Archive-architecture: amd64 i386
+Archive-architecture: amd64 armhf i386 s390x
 Archive-ftp: /debian/
 Archive-http: /debian/
-Archive-upstream: ftp.hu.debian.org
-Maintainer: Gergely Fodemesi <fgergo@eik.bme.hu>
+Archive-upstream: syncproxy.eu.debian.org
+CDImage-ftp: /debian-cd/
+CDImage-http: /debian-cd/
+CDImage-upstream: ftp.de.debian.org
+Volatile-ftp: /debian-volatile/
+Volatile-http: /debian-volatile/
+Volatile-upstream: ftp.at.debian.org
+IPv6: no
+Updates: twice
+Maintainer: Imre Simon <ftp@bme.hu>
 Country: HU Hungary
-Location: Budapest
+Location: Budapest, Hungary
 Sponsor: Budapest University of Technology and Economics http://www.bme.hu/
-IPv6: no
+Bandwidth: 2Gbps
 
 Site: ftp.linux.pt
 Type: leaf
@@ -2781,7 +2827,7 @@
 Site: debian.fastweb.it
 Type: leaf
 Archive-ftp: /debian/
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-http: /debian/
 Archive-rsync: debian/
 X-CDImage-ftp: /debian-cd/
@@ -2791,14 +2837,14 @@
 Country: IT Italy
 Location: Milano
 Sponsor: FastWeb S.p.A. http://www.fastweb.it/
-Comment: Full bandwidth (100 Mbps) only available for FastWeb customers.
+Comment: Full bandwidth (100 Mbps) only available for FastWeb customers. Maintainer address bounces.
 X-Comment: outdated ISO ; spaillar 2007/04/07
 IPv6: no
 
 Site: ftp3.nrc.ca
 Alias: ftp3.ca.debian.org
 Type: Push-Primary
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-ftp: /debian/
 Archive-http: /debian/
 Archive-rsync: debian/
@@ -2815,15 +2861,35 @@
 Country: CA Canada
 Location: Ottawa
 Sponsor: National Research Council Canada http://www.nrc.ca/
-Comment: 1Gb/s to CA*Net4, 30Mb/s elsewhere.
-IPv6: no
+Bandwidth: 1Gb/s
+IPv6: yes
 
 Site: ftp.ie.debian.org
-Alias: debian.heanet.ie
+Includes: debian.heanet.ie
+Type: Push-Secondary
+Archive-ftp: /debian/
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
+Archive-http: /debian/
+Archive-rsync: debian/
+Archive-upstream: kassia.debian.org
+Archive-method: push
+Backports-ftp: /debian-backports/
+Backports-http: /debian-backports/
+Backports-rsync: debian-backports/
+Backports-upstream: syncproxy3.eu.debian.org
+Backports-method: push
+CDImage-ftp: /debian-cd/
+CDImage-http: /debian-cd/
+CDImage-rsync: debian-cd/
+Country: IE Ireland
+IPv6: yes
+
+Site: debian.heanet.ie
 Alias: canyonero.heanet.ie
+Alias: rsyncer.ftp.heanet.ie
 Type: Push-Secondary
 Archive-ftp: /debian/
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-http: /debian/
 Archive-rsync: debian/
 Archive-upstream: kassia.debian.org
@@ -2845,7 +2911,7 @@
 Country: IE Ireland
 Location: Dublin
 Sponsor: HEAnet national mirror server http://ftp.heanet.ie/about/
-Comment: gigabit connectivity to our national and international backbone
+Bandwidth: 10 Gb connectivity to our national and international backbone
 IPv6: yes
 
 Site: debian.ubiobio.cl
@@ -2869,7 +2935,7 @@
 Archive-upstream: ftp.br.debian.org
 X-NonUS-http: /debian-non-US/
 X-NonUS-upstream: non-us.debian.org
-Maintainer:  Waldemar Pires Correa Junior <wjunior@iq.usp.br>, mirror@iq.usp.br 
+Maintainer: Waldemar Pires Correa Junior <wjunior@iq.usp.br>, mirror@iq.usp.br
 Country: BR Brazil
 Location: S&atilde;o Paulo
 Sponsor: IQ-USP http://www.iq.usp.br/
@@ -2878,7 +2944,7 @@
 Site: mirror.nus.edu.sg
 Alias: mirror.comp.nus.edu.sg
 Type: leaf
-Archive-architecture: amd64 i386 kfreebsd-amd64 kfreebsd-i386
+Archive-architecture: amd64 armhf i386 kfreebsd-amd64 kfreebsd-i386 s390x
 Archive-ftp: /pub/Debian/
 Archive-http: /Debian/
 Archive-upstream: ftp.us.debian.org
@@ -2889,27 +2955,29 @@
 Location: Singapore
 Sponsor: National University of Singapore http://www.nus.edu.sg/
 Comment: only has some architectures, max. intl. bandwidth ~ 40Mbits/sec
+Bandwidth: 40Mbits/sec
 IPv6: no
 
 Site: the.earth.li
 Type: leaf
-Archive-architecture: amd64 hurd-i386 i386
+Archive-architecture: amd64 armel armhf i386 s390x
 Archive-ftp: /debian/
 Archive-http: /debian/
 Archive-rsync: debian/
 Archive-upstream: ftp.uk.debian.org
 Maintainer: Jonathan McDowell <noodles-debianmirror@earth.li>
-Country: GB Great Britain
+Country: GB United Kingdom
 Location: London
 Sponsor: earth.li http://www.earth.li/
 Sponsor: RapidSwitch Ltd http://www.rapidswitch.com/
 Comment: Machine has 400Mb/s to the outside world, though
  only has a 100Mb/s ethernet card.
-IPv6: no
+Bandwidth: 100Mb/s
+IPv6: yes
 
 Site: ftp.linux.org.tr
 Type: Push-Secondary
-Archive-architecture: amd64 i386
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-ftp: /debian/
 Archive-http: /debian/
 Archive-rsync: debian/
@@ -2917,7 +2985,7 @@
 Archive-method: push
 CDImage-ftp: /debian-cd/
 CDImage-http: /debian-cd/
-CDImage-rsync: debian-cd/
+X-CDImage-rsync: debian-cd/
 CDImage-upstream: ftp.tr.debian.org
 Security-architecture: amd64 i386
 Security-ftp: /debian-security/
@@ -2936,24 +3004,24 @@
 Sponsor: LKD http://www.linux.org.tr/
 Sponsor: Ulakbim http://www.ulak.net.tr/
 IPv6: no
-Comment: 1 Gbps connection
+Bandwidth: 1 Gbps
 
 Site: ukdebian.mirror.anlx.net
 Type: Push-Primary
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-ftp: /debian/
 Archive-http: /debian/
 Archive-rsync: debian/
 Archive-upstream: syncproxy.eu.debian.org
 Maintainer: mirror@anlx.net, support@anlx.net
-Country: GB Great Britain
+Country: GB United Kingdom
 Location: London
 Sponsor: Associated Networks Ltd http://www.anlx.net/
 IPv6: no
 
 Site: mirror.ox.ac.uk
 Type: leaf
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-ftp: /debian/
 Archive-http: /debian/
 Volatile-ftp: /debian-volatile/
@@ -2963,28 +3031,30 @@
 Volatile-upstream: volatile.debian.net
 Updates: twice
 Maintainer: Oxford University Computing Services <sysdev@oucs.ox.ac.uk>, Stephen Quinney <stephen.quinney@computing-services.oxford.ac.uk>, moog <moog@sysdev.oucs.ox.ac.uk>
-Country: GB Great Britain
+Country: GB United Kingdom
 Location: Oxford
 Sponsor: Oxford University Computing Services http://www.oucs.ox.ac.uk/
-Comment: Two servers, 1Gbps
+Comment: Two servers
+Bandwidth: 1Gbps
 
 Site: mirrors.geeks.org
 Type: leaf
 Archive-architecture: amd64 i386 kfreebsd-amd64 kfreebsd-i386
-Archive-ftp: /debian/
-Archive-http: /debian/
+X-Archive-ftp: /debian/
+X-Archive-http: /debian/
 Archive-upstream: mirrors.kernel.org
 Maintainer: Mike Horwath <drechsau@geeks.org>
 Country: US United States
 Location: Minneapolis, Minnesota
 Sponsor: Geeks Organizations http://www.geeks.org/
 Sponsor: Vector Internet Services, Inc. http://www.visi.com/
-IPv6: no
+Comment: doesn't include sources
+IPv6: yes
 
 Site: ftp.crihan.fr
 Type: leaf
 Archive-ftp: /debian/
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armhf i386 s390x
 Archive-http: /debian/
 Archive-rsync: debian/
 NonUS-ftp: /debian-non-US/
@@ -2998,56 +3068,67 @@
 IPv6: yes
 
 Site: ftp.ro.debian.org
-Alias: ftp.iasi.roedu.net
+Includes: ftp.iasi.roedu.net
 Type: Push-Primary
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-ftp: /debian/
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
 Archive-http: /debian/
 Archive-rsync: debian/
-NonUS-ftp: /debian-non-US/
-NonUS-http: /debian-non-US/
-NonUS-rsync: debian-non-US/
-CDImage-ftp: /debian-cd/
-CDImage-http: /debian-cd/
-CDImage-rsync: debian-cd/
+Archive-upstream: syncproxy.eu.debian.org
+Country: RO Romania
+IPv6: no
+
+Site: ftp.iasi.roedu.net
+Type: Push-Primary
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
+Archive-ftp: /debian/
+Archive-http: /debian/
+Archive-rsync: debian/
+X-NonUS-ftp: /debian-non-US/
+X-NonUS-http: /debian-non-US/
+X-NonUS-rsync: debian-non-US/
+X-CDImage-ftp: /debian-cd/
+X-CDImage-http: /debian-cd/
+X-CDImage-rsync: debian-cd/
 Archive-upstream: syncproxy.eu.debian.org
 Maintainer: Manuel Subredu <diablo@iasi.roedu.net>, ftpadmin@iasi.roedu.net
 Country: RO Romania
 Location: Iasi
 Sponsor: Romanian Education Network Iasi Branch http://www.iasi.roedu.net/
-Comment: maximum bandwidth 310Mbps
-IPv6: no
+Bandwidth: 310Mbps
+IPv6: yes
 
 Site: opensource.nchc.org.tw
 Alias: os.nchc.org.tw
 Type: leaf
 Archive-ftp: /debian/
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-http: /debian/
 Archive-upstream: debian-mirror.cs.umn.edu
 Maintainer: Yu-Chung Chen <julian@opensource.nchc.org.tw>, ftpadmin@opensource.nchc.org.tw
+Comment: maintainer addresses bounce
 Country: TW Taiwan
 Sponsor: Opensource Taskforce, National Center for High-Performance Computing http://opensource.nchc.gov.tw/
 IPv6: no
 
 Site: mirrors.geekbone.org
 Type: leaf
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
-Archive-ftp: /debian/
-Archive-http: /debian/
-Archive-rsync: debian/
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
+X-Archive-ftp: /debian/
+X-Archive-http: /debian/
+X-Archive-rsync: debian/
 Archive-upstream: ftp.us.debian.org
-Volatile-ftp: /debian-volatile/
-Volatile-http: /debian-volatile/
-Volatile-rsync: debian-volatile/
-NonUS-ftp: /debian-non-US/
-NonUS-http: /debian-non-US/
-NonUS-rsync: debian-non-US/
+X-Volatile-ftp: /debian-volatile/
+X-Volatile-http: /debian-volatile/
+X-Volatile-rsync: debian-volatile/
+X-NonUS-ftp: /debian-non-US/
+X-NonUS-http: /debian-non-US/
+X-NonUS-rsync: debian-non-US/
 Maintainer: Cheng Cheng <geekjim@yahoo.com>, James Cheng <mirroradmin@geekbone.org>
 Country: CN China
 Location: Shanghai
 Sponsor: GeekBone http://www.geekbone.org/
-Comment: 100M connection to China backbone network
+Bandwidth: 100Mb connection to China backbone network
 IPv6: no
 
 Site: debian.uni.edu.ni
@@ -3055,10 +3136,12 @@
 Archive-http: /debian/
 Archive-architecture: amd64 i386
 Archive-upstream: mirrors.kernel.org
-Maintainer: waperez@corc.uni.edu.ni
+Maintainer: debmir@uni.edu.ni
 Country: NI Nicaragua
 Location: Managua
 Sponsor: Universidad Nacional de Ingenier&iacute;a http://www.uni.edu.ni/
+Bandwidth: 2Mbps
+Updates: once
 IPv6: no
 
 Site: ftp.ps.pl
@@ -3078,9 +3161,9 @@
 Sponsor: Technical University of Szczecin http://www.ps.pl/
 IPv6: no
 
-Site: ftp.port80.se
+Site: ftp.availo.se
 Type: leaf
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-ftp: /debian/
 Archive-http: /debian/
 Archive-upstream: ftp.fi.debian.org
@@ -3089,43 +3172,48 @@
 CDImage-upstream: ftp.fi.debian.org
 NonUS-ftp: /debian-non-US/
 NonUS-http: /debian-non-US/
-Maintainer: Robert Olsson <noc@p80.net>, Rickhard Carlsw&auml;rd <rickhard@port80.se>
+Maintainer: Martin Östlund <martin.ostlund@availo.se>
 Country: SE Sweden
 Location: Stockholm
-Sponsor: Port80 AB http://www.port80.se/
+Sponsor: Availo Networks AB http://www.availo.se/
 Comment: distributed across several servers with gigabit cards
 IPv6: no
 
 Site: debian.inode.at
 Type: leaf
 Archive-ftp: /debian/
-Archive-architecture: alpha amd64 arm armel i386 kfreebsd-amd64 kfreebsd-i386 powerpc sparc
+Archive-architecture: amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 powerpc s390x sparc
 Archive-http: /debian/
 Archive-rsync: debian/debian/
+Archive-upstream: ftp.at.debian.org
+Backports-ftp: /debian-backports/
+Backports-http: /debian-backports/
+Backports-rsync: debian/debian-backports/
+Backports-upstream: ftp.at.debian.org
 CDImage-ftp: /debian-cd/
 CDImage-http: /debian-cd/
 CDImage-rsync: debian/debian-cd/
 Volatile-http: /debian-volatile/
 Volatile-ftp: /debian-volatile/
 Volatile-rsync: debian/debian-volatile/
-Archive-upstream: ftp.de.debian.org
 Maintainer: Michael Renner <mirror@inode.at>
 Country: AT Austria
 Location: Vienna
 Sponsor: Inode Telekommunikationsdienstleistungs GmbH http://www.inode.at/
 Comment: bandwidth 2 gbit within Austria, ~400 - 500 Mbit international,
  the server itself is on two 100 Mbit NICs
+Bandwidth: 200Mb
 IPv6: no
 X-Comment: still has debian-amd64
 
 Site: mirrors.usc.edu
 Type: leaf
 Archive-ftp: /pub/linux/distributions/debian/
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-http: /pub/linux/distributions/debian/
 Archive-rsync: debian/
-CDImage-ftp: /pub/linux/distributions/debian-cd/
-CDImage-http: /pub/linux/distributions/debian-cd/
+X-CDImage-ftp: /pub/linux/distributions/debian-cd/
+X-CDImage-http: /pub/linux/distributions/debian-cd/
 CDImage-rsync: debian-cd/
 Archive-upstream: debian.lcs.mit.edu
 Maintainer: mirrors@linux.usc.edu
@@ -3149,9 +3237,9 @@
 Type: leaf
 Archive-ftp: /debian/
 Archive-http: /debian/
-Archive-architecture: amd64 i386 ia64 kfreebsd-amd64 kfreebsd-i386 powerpc
+Archive-architecture: amd64 armhf i386 ia64 kfreebsd-amd64 kfreebsd-i386 powerpc s390x
 Archive-rsync: debian/
-CDImage-ftp: /debian-cd/
+X-CDImage-ftp: /debian-cd/
 CDImage-http: /debian-cd/
 CDImage-rsync: debian-cd/
 Security-ftp: /debian-security/
@@ -3166,11 +3254,11 @@
 
 Site: ftp.caliu.cat
 Type: leaf
-Archive-architecture: amd64 armel i386 ia64 kfreebsd-amd64 kfreebsd-i386 powerpc
+Archive-architecture: amd64 armel i386 kfreebsd-amd64 kfreebsd-i386
 Archive-ftp: /debian/
 Archive-http: /debian/
-CDImage-ftp: /debian-cd/
-CDImage-http: /debian-cd/
+X-CDImage-ftp: /debian-cd/
+X-CDImage-http: /debian-cd/
 Archive-upstream: ftp.es.debian.org
 Maintainer: Francesc Genov&eacute; Mu&ntilde;oz <francesc@genove.info>
 Country: ES Spain
@@ -3178,16 +3266,15 @@
 Sponsor: CALIU - CAtalan GNU/LInux Users http://caliu.cat/
 Sponsor: Universitat Polit&egrave;cnica de Catalunya http://www.upc.edu/
 IPv6: no
-X-Comment: still has debian-amd64;  /dists/ has files for more arches than actual debs in /pool/
 
 Site: ftp.isu.edu.tw
 Type: leaf
-Archive-architecture: alpha amd64 arm armel hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-ftp: /debian/
 Archive-http: /debian/
 Archive-rsync: debian/
-CDImage-ftp: /pub/Linux/Debian/debian-cd/
-CDImage-http: /pub/Linux/Debian/debian-cd/
+X-CDImage-ftp: /pub/Linux/Debian/debian-cd/
+X-CDImage-http: /pub/Linux/Debian/debian-cd/
 CDImage-rsync: debian-cd/
 Archive-upstream: ftp.tw.debian.org
 Maintainer: KTH <ftpadm@ftp.isu.edu.tw>
@@ -3207,11 +3294,11 @@
 
 Site: debian.ihug.co.nz
 Type: leaf
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-ftp: /debian/
 Archive-http: /debian/
 Archive-upstream: ftp.au.debian.org
-Security-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+Security-architecture: amd64 armel hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
 Security-ftp: /debian-security/
 Security-http: /debian-security/
 Security-upstream: ftp.se.debian.org
@@ -3223,7 +3310,7 @@
 
 Site: lug.mtu.edu
 Type: leaf
-Archive-architecture: alpha amd64 hppa i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc sparc
+Archive-architecture: amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390x sparc
 Archive-ftp: /debian/
 Archive-http: /debian/
 Archive-rsync: debian/
@@ -3232,71 +3319,49 @@
 Country: US United States
 Location: Houghton, Michigan
 Sponsor: Michigan Tech Linux Users Group http://lug.mtu.edu/
-IPv6: no
-
-Site: ftp.yz.yamagata-u.ac.jp
-Alias: linux.yz.yamagata-u.ac.jp
-Type: leaf
-Archive-ftp: /debian/
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
-Archive-http: /debian/
-Archive-upstream: ftp.jp.debian.org
-CDImage-ftp: /debian-cd/
-CDImage-http: /debian-cd/
-Maintainer: Tomohiro Ito <tomohiro@yz.yamagata-u.ac.jp>
-Country: JP Japan
-Location: Yonezawa, Yamagata
-Sponsor: Faculty of Engineering, Yamagata University http://www.yz.yamagata-u.ac.jp/
-IPv6: no
-
-Site: www.ua.debian.org
-Alias: www.debian.org.ua
-Type: Push-Primary
-WWW-http: /
-WWW-upstream: www-master.debian.org
-Maintainer: Oleg Milaenko <omnix@3logic.net>
-Location: Kiev
-Country: UA Ukraine
-Sponsor: TriLogiC Group, Ltd. http://www.3logic.net/
-IPv6: no
+IPv6: yes
 
 Site: ftp.ua.debian.org
 Alias: debian.org.ua
 Alias: lumpy.3logic.net
 Type: Push-Secondary
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-ftp: /debian/
 Archive-http: /debian/
 Archive-rsync: debian/
+Archive-upstream: ftp.de.debian.org
+Backports-ftp: /debian-backports/
+Backports-http: /debian-backports/
+Backports-rsync: debian-backports/
+Backports-upstream: ftp.de.debian.org
 CDImage-ftp: /debian-cd/
 CDImage-http: /debian-cd/
-CDImage-rsync: debian-cd/
+X-CDImage-rsync: debian-cd/
+CDImage-upstream: ftp.de.debian.org
 Old-ftp: /debian-archive/
 Old-http: /debian-archive/
 Old-rsync: debian-archive/
 Security-ftp: /debian-security/
 Security-http: /debian-security/
 Security-rsync: debian-security/
+Security-upstream: ftp.de.debian.org
 Volatile-ftp: /debian-volatile/
 Volatile-http: /debian-volatile/
 Volatile-rsync: debian-volatile/
-IPv6: no
-Archive-upstream: ftp.de.debian.org
-Security-upstream: ftp.de.debian.org
-CDImage-upstream: ftp.de.debian.org
 Volatile-upstream: ftp.de.debian.org
+IPv6: no
 Updates: push
-Maintainer: Oleg Milaenko <omnix@debian.org.ua>
+Maintainer: Oleg Milaenko <omnix@debian.org.ua>, team@debian.org.ua
 Country: UA Ukraine
 Location: Kiev, UA
-Sponsor: ColoCall http://www.colocall.net/
-Comments: 100Mbps in Ukraine (UA-IX http://ua-ix.net.ua/eng.phtml), 4Mbps other
+Sponsor: MHost http://mhost.kiev.ua/
+Bandwidth: 100Mbps in Ukraine (UA-IX http://ua-ix.net.ua/eng.phtml), 4Mbps other
 
 Site: ftp.kr.debian.org
 Alias: ftp.kaist.ac.kr
 Type: Push-Primary
 Archive-ftp: /debian/
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-http: /debian/
 Archive-rsync: debian/
 Archive-upstream: syncproxy.wna.debian.org
@@ -3308,7 +3373,7 @@
 Backports-method: push
 CDImage-ftp: /debian-cd/
 CDImage-http: /debian-cd/
-CDImage-rsync: debian-cd/
+X-CDImage-rsync: debian-cd/
 CDImage-upstream: cdimage.debian.org
 CDImage-method: push
 Old-ftp: /debian-archive/
@@ -3324,7 +3389,7 @@
 Location: Daejeon
 Sponsor: Korea Advanced Institute of Science and Technology http://www.kaist.ac.kr/
 Sponsor: SPARCS http://sparcs.kaist.ac.kr/
-Comment: 1Gbps bandwidth.
+Bandwidth: 1Gbps
 IPv6: no
 
 Site: gulus.usherbrooke.ca
@@ -3340,7 +3405,7 @@
 Site: ftp.lug.ro
 Type: leaf
 Archive-ftp: /debian/
-Archive-architecture: amd64 i386 kfreebsd-amd64 kfreebsd-i386 powerpc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390x sparc
 Archive-http: /debian/
 CDImage-ftp: /debian-cd/
 CDImage-http: /debian-cd/
@@ -3399,7 +3464,7 @@
 Type: Push-Secondary
 Archive-ftp: /debian/
 Archive-http: /debian/
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 CDImage-ftp: /debian-cd/
 CDImage-http: /debian-cd/
 CDImage-architecture: amd64 i386 multi-arch
@@ -3414,23 +3479,23 @@
 Site: ftp.uni-bayreuth.de
 Alias: btr0x2.rz.uni-bayreuth.de
 Type: leaf
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-ftp: /debian/
 Archive-http: /debian/
-CDImage-ftp: /debian-cd/
+X-CDImage-ftp: /debian-cd/
 CDImage-http: /debian-cd/
 Archive-upstream: ftp.de.debian.org
 Maintainer: Tom Rueger <Tom.Rueger@uni-bayreuth.de>, ftp@uni-bayreuth.de
 Country: DE Germany
 Location: Bayreuth
 Sponsor: University of Bayreuth http://www.uni-bayreuth.de/
-Comment: Maximum bandwidth: 1Gbps
- Rsync is on rsync.uni-bayreuth.de (aka btr0xq.rz.uni-bayreuth.de).
+Comment: Rsync is on rsync.uni-bayreuth.de (aka btr0xq.rz.uni-bayreuth.de).
+Bandwidth: 1Gbps maximum
 IPv6: no
 
 Site: rsync.uni-bayreuth.de
 Alias: btr0qx.rz.uni-bayreuth.de
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-rsync: debian/
 CDImage-rsync: debian-cd/
 Type: leaf
@@ -3445,10 +3510,10 @@
 Site: ftp.ds.karen.hj.se
 Alias: ftp.ds.hj.se
 Type: leaf
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-ftp: /debian/
 Archive-http: /debian/
-CDImage-ftp: /debian-cd/
+X-CDImage-ftp: /debian-cd/
 CDImage-http: /debian-cd/
 Archive-upstream: ftp.se.debian.org
 Maintainer: rootgruppen@ds.karen.hj.se, Johan Gunnarsson <johan@ds.hj.se>, Magnus Tornqvist <sysop@ds.hj.se>
@@ -3473,9 +3538,9 @@
 Archive-ftp: /debian/
 Archive-http: /debian/
 Archive-rsync: /debian/
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
-CDImage-ftp: /debian-cd/
-CDImage-http: /debian-cd/
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
+X-CDImage-ftp: /debian-cd/
+X-CDImage-http: /debian-cd/
 CDImage-rsync: debian-cd/
 Security-ftp: /debian-security/
 Security-http: /debian-security/
@@ -3488,11 +3553,11 @@
 Country: BG Bulgaria
 Location: Sofia, 42.6740/23.3305
 Sponsor: University of Sofia http://www.uni-sofia.bg/
-IPv6: no
+IPv6: yes
 
 Site: debian.nctu.edu.tw
 Type: Push-Secondary
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-ftp: /debian/
 Archive-http: /debian/
 Archive-rsync: debian/
@@ -3508,85 +3573,44 @@
 Sponsor: Computer and Network Center, National Chiao-Tung University, Hsinchu, Taiwan. http://www.nctu.edu.tw/
 Comment: This site is upgraded for offering better services.
  It consists of 16GB RAM, an FC-based storage and a 2Gb-bonding uplink now.
+Bandwidth: 2Gb
 
-Site: ftp.3logic.net
-Alias: borg.3logic.net
+Site: ftp.th.debian.org
+Alias: ftp.coe.psu.ac.th
+Alias: ftp.v6.coe.psu.ac.th
+Alias: debian.coe.psu.ac.th
 Type: leaf
-Archive-architecture: amd64 i386
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-ftp: /debian/
+Archive-http: /debian/
 Archive-rsync: debian/
-CDImage-ftp: /debian-cd/
-CDImage-rsync: debian-cd/
-Old-ftp: /debian-archive/
-Old-rsync: debian-archive/
-Security-ftp: /debian-security/
-Security-rsync: debian-security/
-IPv6: no
-Archive-upstream: debian.org.ua
-Security-upstream: debian.org.ua
-CDImage-upstream: debian.org.ua
-Updates: push
-Maintainer: Oleg Milaenko <omnix@debian.org.ua>
-Country: UA Ukraine
-Location: Kherson, UA
-Comments: 100Mbps for KHERSON-IX (AS-KHERSON), 10M other
-
-Site: ftp.th.debian.org
-Alias: ftp.coe.psu.ac.th
-Alias: debian.coe.psu.ac.th
-Type: leaf
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
-Archive-ftp: /debian/
-Archive-http: /debian/
-Archive-rsync: debian/
-Archive-upstream: ftp.tw.debian.org
+Archive-upstream: ftp.jp.debian.org
 Backports-ftp: /debian-backports/
 Backports-http: /debian-backports/
 Backports-rsync: debian-backports/
-Backports-upstream: www.backports.org
+Backports-upstream: ftp.tw.debian.org
 Volatile-ftp: /debian-volatile/
 Volatile-http: /debian-volatile/
 Volatile-rsync: debian-volatile/
 Volatile-upstream: ftp.tw.debian.org
+Security-ftp: /debian-security/
+Security-http: /debian-security/
+Security-rsync: debian-security/
+Security-upstream: security.debian.org
 CDImage-ftp: /debian-cd/
 CDImage-http: /debian-cd/
-CDImage-rsync: debian-cd/
+X-CDImage-rsync: debian-cd/
 CDImage-upstream: cdimage.debian.org
 Maintainer: CoE Sysadmin Team <sysadmin@coe.psu.ac.th>, Chatchai Jantaraprim <cj@coe.psu.ac.th>
 Country: TH Thailand
 Location: Songkhla, Thailand
 Sponsor: Computer Engineering Department, Prince of Songkla University, Thailand http://www.coe.psu.ac.th
-IPv6: no
-Comments: 100Mbps via UniNet
-
-Site: ftp.v6.coe.psu.ac.th
-Alias: debian.coe.psu.ac.th
-Type: leaf
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
-Archive-ftp: /debian/
-Archive-http: /debian/
-Archive-rsync: debian/
-Archive-upstream: debian.osuosl.org
-Backports-ftp: /debian-backports/
-Backports-http: /debian-backports/
-Backports-rsync: debian-backports/
-Backports-upstream: www.backports.org
-Volatile-ftp: /debian-volatile/
-Volatile-http: /debian-volatile/
-Volatile-rsync: debian-volatile/
-Volatile-upstream: volatile.debian.org
-CDImage-ftp: /debian-cd/
-CDImage-http: /debian-cd/
-CDImage-upstream: cdimage.debian.org
-Maintainer: Chatchai Jantaraprim <cj@coe.psu.ac.th>
-Country: TH Thailand
-Location: Computer Engineering Dept.
-Sponsor: Prince of Songkla University http://www.coe.psu.ac.th/
 IPv6: yes
+Comments: 100Mbps via UniNet
 
 Site: mirror.cpsc.ucalgary.ca
 Type: leaf
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-ftp: /debian/
 Archive-http: /mirror/debian.org/debian/
 Archive-rsync: debian/
@@ -3599,12 +3623,12 @@
 Location: Calgary, Alberta
 Sponsor: Dept. of Computer Science, University of Calgary http://www.cpsc.ucalgary.ca/
 Updates: once
-Comment: 100Mbps connection
+Bandwidth: 100Mbps
 IPv6: no
 
 Site: ftp.informatik.hu-berlin.de
 Type: leaf
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
 Archive-ftp: /pub/Linux/debian/
 Archive-upstream: ftp.fu-berlin.de
 X-CDImage-ftp: /pub/Mirrors/ftp.de.debian.org/debian-cd/
@@ -3617,7 +3641,7 @@
 Site: ftp.riken.jp
 Alias: ftp.riken.go.jp
 Type: leaf
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-ftp: /Linux/debian/debian/
 Archive-http: /Linux/debian/debian/
 Archive-rsync: debian/
@@ -3646,11 +3670,15 @@
 
 Site: mirror.peer1.net
 Type: leaf
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-http: /debian/
 Archive-upstream: debian.mirror.iweb.ca
-Volatile-http: /debian-volatile/
-Volatile-upstream: debian.mirror.iweb.ca
+Backports-http: /debian-backports/
+Backports-upstream: debian.mirror.rafal.ca
+X-Volatile-http: /debian-volatile/
+X-Volatile-upstream: debian.mirror.iweb.ca
+Security-http: /debian-security/
+Security-upstream: security.debian.org
 IPv6: no
 Updates: once
 Maintainer: Nate Elkan <mirror@peer1.com>, Nate Elkan <debian@peer1.com>
@@ -3658,27 +3686,31 @@
 Location: Vancouver
 Sponsor: Peer 1 Hosting http://www.peer1.com
 
-Site: ftp.debian.ikoula.com
+Site: mirror.debian.ikoula.com
 Type: leaf
 Archive-ftp: /debian/
-Archive-architecture: amd64 i386 kfreebsd-amd64 kfreebsd-i386
-Archive-upstream: ftp.fr.debian.org
-Maintainer: Romain Kubany <tech@ikoula.com>
+Archive-http: /debian/
+Archive-rsync: debian/
+Archive-architecture: amd64 i386
+Archive-upstream: ftp2.fr.debian.org
+Maintainer: Romain Kubany <tech@ikoula.com>, mirrors@ikoula.com
 Country: FR France
-Location: Ikoula http://www.ikoula.com/
+Location: Reims
+Sponsor: Ikoula http://www.ikoula.com/
+Bandwidth: 1Gbps
 IPv6: no
 
 Site: ftp.man.szczecin.pl
 Alias: rubycon.man.szczecin.pl
 Type: leaf
 Archive-ftp: /pub/Linux/debian/
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-upstream: ftp.de.debian.org
 Maintainer: Tomasz Grabowski <mirroring@rubycon.man.szczecin.pl>
 Country: PL Poland
 Location: Szczecin
 Sponsor: Academic Centre of Computer Science - PS http://www.aci.com.pl/
-Comment: 100 Mbps bandwidth
+Bandwidth: 100 Mbps
 IPv6: no
 
 Site: debian.las.ic.unicamp.br
@@ -3689,7 +3721,7 @@
 Archive-rsync: debian/
 CDImage-ftp: /debian-cd/
 CDImage-http: /debian-cd/
-CDImage-rsync: debian-cd/
+X-CDImage-rsync: debian-cd/
 Archive-upstream: ftp.br.debian.org
 Maintainer: Felipe Massia Pereira <felipe@las.ic.unicamp.br>
 Country: BR Brazil
@@ -3701,7 +3733,7 @@
 Site: ftp5.gwdg.de
 Type: leaf
 Archive-ftp: /pub/linux/debian/debian/
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-http: /pub/linux/debian/debian/
 Archive-rsync: pub/linux/debian/debian/
 CDImage-ftp: /pub/linux/debian/debian-cd/
@@ -3715,7 +3747,7 @@
 Country: DE Germany
 Location: G&ouml;ttingen
 Sponsor: GWDG http://www.gwdg.de/
-Comment: 622 MBit/sec
+Bandwidth: 622 MBit/sec
 IPv6: no
 
 Site: www.ring.gr.jp
@@ -3723,7 +3755,7 @@
 Alias: aist.ring.gr.jp
 Type: leaf
 X-Archive-ftp: /pub/linux/debian/debian/
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 X-Archive-http: /archives/linux/debian/debian/
 Archive-upstream: ftp.jp.debian.org
 Maintainer: ftpadmin@ring.gr.jp
@@ -3736,7 +3768,7 @@
 Alias: mirror.mountaincable.net
 Alias: ftp4.ca.debian.org
 Type: Push-Primary
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-ftp: /debian/
 Archive-http: /debian/
 Archive-rsync: debian/
@@ -3754,13 +3786,13 @@
 Sponsor: Rafal Rzeczkowski http://www.rafal.ca/
 Sponsor: Mountain Cablevision http://www.mountaincable.net/
 Sponsor: Tetraplex Limited http://www.tetraplex.com/
-Comment: 100 Mbit/s connection, 700 Mbit/s aggregate bandwidth, TorIX peering.
-IPv6: no
+Bandwidth: 100 Mbit/s connection, 700 Mbit/s aggregate bandwidth, TorIX peering.
+IPv6: yes
 
 Site: debian.mirrors.tds.net
 Type: leaf
 Archive-ftp: /debian/
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-http: /debian/
 Archive-rsync: debian/
 Archive-upstream: ftp.se.debian.org
@@ -3768,17 +3800,30 @@
 Country: US United States
 Location: Wisconsin
 Sponsor: TDS Internet Services http://www.tds.net/
-Comment: Bandwidth=OC12, server bandwidth=100MB
+Comment: Bandwidth=OC12
+Bandwidth: 100MB
 IPv6: no
 
 Site: ftp.ch.debian.org
-Alias: debian.ethz.ch
+Includes: debian.ethz.ch
+Type: Push-Primary
+Archive-ftp: /debian/
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
+Archive-http: /debian/
+Archive-rsync: debian/
+Archive-upstream: kassia.debian.org
+Archive-method: push
+Country: CH Switzerland
+IPv6: no
+
+Site: debian.ethz.ch
 Type: Push-Primary
 Archive-ftp: /debian/
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-http: /debian/
 Archive-rsync: debian/
 Archive-upstream: kassia.debian.org
+Archive-method: push
 Backports-ftp: /debian-backports/
 Backports-http: /debian-backports/
 Backports-rsync: debian-backports/
@@ -3803,26 +3848,26 @@
 Sponsor: ETHZ, Department of Physics http://www.phys.ethz.ch/
 Comment: 1GBit ethernet connection, available bandwith and disk I/O
  approximately 40~50MBytes/s
+Bandwidth: 50MB
 IPv6: no
 
-Site: debian.cites.uiuc.edu
-Alias: bazaar.cites.uiuc.edu
-Alias: cosmos.cites.uiuc.edu
+Site: debian.cites.illinois.edu
 Type: leaf
-Archive-architecture: amd64 hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 powerpc sparc
+Archive-architecture: amd64 armhf i386 powerpc s390x
 Archive-ftp: /pub/debian/
 Archive-http: /pub/debian/
 CDImage-ftp: /pub/debian-cd/
 CDImage-http: /pub/debian-cd/
 Archive-upstream: debian.oregonstate.edu
 Maintainer: Chris Kuehn <cosmos@cosmos.cites.uiuc.edu>
+Comment: maintainer address bounces
 Country: US United States
 IPv6: no
 
 Site: mirrors.telianet.dk
 Alias: mirrors.dk.telia.net
 Type: leaf
-Archive-architecture: amd64 i386 powerpc sparc
+Archive-architecture: amd64 armhf i386 s390x
 Archive-ftp: /debian/
 Archive-http: /debian/
 NonUS-ftp: /debian-non-us/
@@ -3833,53 +3878,56 @@
 Location: Glostrup, Copenhagen
 Sponsor: Telia Networks http://telia.dk
 Updates: twice
-Comment: 100Mbps.
+Bandwidth: 100Mbps
 IPv6: no
 
 Site: webb.ens-cachan.fr
 Alias: debian.ens-cachan.fr
 Type: leaf
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-ftp: /debian/
 Archive-http: /debian/
-CDImage-ftp: /debian-cd/
-CDImage-http: /debian-cd/
+X-CDImage-ftp: /debian-cd/
+X-CDImage-http: /debian-cd/
 NonUS-ftp: /debian-non-US/
 NonUS-http: /debian-non-US/
 Old-ftp: /ftp/debian-archive/
 Old-http: /ftp/debian-archive/
 Archive-upstream: ftp.de.debian.org
 Maintainer: Emmanuel Quemener <emmanuel.quemener@ens-cachan.fr>
+Comment: maintainer address bounces
 Country: FR France
 Location: Ecole Normale Superieure de Cachan
 IPv6: no
 
 Site: ftp.jaist.ac.jp
 Type: leaf
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
-Archive-ftp: /pub/Linux/Debian/
-Archive-http: /pub/Linux/Debian/
-Archive-rsync: pub/Linux/Debian/
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
+Archive-ftp: /debian/
+Archive-http: /debian/
+Archive-rsync: debian/
+Archive-upstream: ftp.jp.debian.org
+Archive-method: push
 Backports-ftp: /debian-backports/
 Backports-http: /debian-backports/
 Backports-rsync: debian-backports/
-Backports-upstream: hanzubon.jp
+Backports-upstream: ftp.jp.debian.org
 Backports-method: push
-CDImage-ftp: /pub/Linux/Debian-CD/
-CDImage-http: /pub/Linux/Debian-CD/
-CDImage-rsync: pub/Linux/Debian-CD/
-Archive-upstream: ftp.jp.debian.org
+CDImage-ftp: /debian-cd/
+CDImage-http: /debian-cd/
+CDImage-rsync: debian-cd/
+CDImage-upstream: cdimage.debian.org
 Maintainer: FTP admins <ftp-admin@jaist.ac.jp>
 Country: JP Japan
 Location: Ishikawa
 Sponsor: Japan Advanced Institute of Science and Technology http://www.jaist.ac.jp/
-IPv6: no
+IPv6: yes
 
 Site: ftp.by.debian.org
 Alias: ftp.mgts.by
 Aliases: ftp.byfly.by
 Type: Push-Secondary
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-ftp: /debian/
 Archive-http: /debian/
 Archive-rsync: debian/
@@ -3908,12 +3956,12 @@
 Country: BY Belarus
 Location: Minsk
 Sponsor: RUE Beltelecom, MGTS http://www.beltelecom.by/
-Comment: Network connection 1Gb/s
+Bandwidth: 1Gb/s
 X-Comment: generates ISOs localy using jigdo
 
 Site: mirrors.ircam.fr
 Type: leaf
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-ftp: /pub/debian/
 Archive-http: /pub/debian/
 NonUS-ftp: /pub/debian-non-US/
@@ -3925,7 +3973,7 @@
 
 Site: ftp.unina.it
 Type: leaf
-X-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+X-Archive-architecture: amd64 armel hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
 X-Archive-http: /pub/linux/distributions/debian/
 X-Archive-upstream: ftp.ch.debian.org
 X-CDImage-http: /pub/linux/distributions/debian-cd/
@@ -3933,35 +3981,39 @@
 Country: IT Italy
 Location: Naples
 Sponsor: Universita' di Napoli http://www.unina.it/
-IPv6: no
+IPv6: yes
 
 Site: ftp.hosteurope.de
 Type: leaf
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
-Archive-ftp: /pub/linux/debian/
-Archive-http: /pub/linux/debian/
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
+Archive-ftp: /mirror/ftp.debian.org/debian/
+Archive-http: /mirror/ftp.debian.org/debian/
 Archive-rsync: debian/
+Security-ftp: /mirror/ftp.debian.org/debian-security/
+Security-http: /mirror/ftp.debian.org/debian-security/
+Security-rsync: debian-security/
 CDImage-ftp: /mirror/ftp.debian.org/debian-cd/
 CDImage-http: /mirror/ftp.debian.org/debian-cd/
 CDImage-rsync: debian-cd/
+Old-ftp: /mirror/archive.debian.org/
+Old-http: /mirror/archive.debian.org/
 Archive-upstream: ftp.de.debian.org
 Maintainer: Tobias Offermann <mirror-debian@hosteurope.de>
 Country: DE Germany
 Location: Cologne
 Sponsor: Host Europe GmbH http://www.hosteurope.de/
 Updates: every six hours
-Comment: Server is on a rate-limited Gigabit Ethernet,
- up to 350 Mbit/sec during european night hours.
-IPv6: no
+Bandwidth: 900Mbit/s
+IPv6: yes
 
 Site: mirror.optus.net
 Alias: mirror.optusnet.com.au
 Type: leaf
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-ftp: /debian/
 Archive-http: /debian/
 Archive-upstream: ftp.au.debian.org
-Maintainer: OptusNet Server Group <servers@staff.optus.net>
+Maintainer: OptusNet Server Group <servers@staff.optus.net>, mirror@staff.optusnet.com.au
 Country: AU Australia
 Sponsor: OptusNet http://www.optusnet.com.au/
 IPv6: no
@@ -3969,7 +4021,7 @@
 Site: ftp.informatik.uni-frankfurt.de
 Alias: ftp.cs.uni-frankfurt.de
 Type: leaf
-Archive-architecture: amd64 i386 ia64 kfreebsd-amd64 kfreebsd-i386 powerpc
+Archive-architecture: amd64 armel armhf i386 ia64 kfreebsd-amd64 kfreebsd-i386 powerpc s390x
 Archive-http: /debian/
 Archive-ftp: /pub/Mirrors/debian.org/debian/
 Archive-rsync: debian/debian/
@@ -3981,7 +4033,7 @@
 CDImage-architecture: amd64 i386 ia64 powerpc
 CDImage-http: /debian-cd/
 CDImage-ftp: /pub/Mirrors/debian.org/debian-cd/
-CDImage-rsync:  debian/debian-cd/
+CDImage-rsync: debian/debian-cd/
 CDImage-upstream: ftp.de.debian.org
 Security-architecture: amd64 i386 ia64 powerpc
 Security-http: /debian-security/
@@ -3993,15 +4045,15 @@
 Sponsor: Johann Wolfgang Goethe-Universit&auml;t Frankfurt am Main http://www.cs.uni-frankfurt.de/
 IPv6: no
 Updates: once
-Comment: bandwidth 155Mbit
+Bandwidth: 155Mbit
 
 Site: debian.unesr.edu.ve
 Type: leaf
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 i386 ia64 powerpc sparc
 Archive-http: /debian/
 Archive-upstream: http.us.debian.org
 Security-http: /debian-security/
-Maintainer: Ernesto Hernandez-Novich <emhn@itverx.com.ve>, tecnologia@unesr.edu.ve
+Maintainer: mirror@unesr.edu.ve, mirror.unesr@gmail.com
 Country: VE Venezuela
 Location: Caracas
 Sponsor: Universidad Nacional Experimental Simon Rodriguez http://www.unesr.edu.ve
@@ -4009,7 +4061,7 @@
 
 Site: ftp.ccc.uba.ar
 Type: leaf
-Archive-architecture: amd64 i386 kfreebsd-amd64 kfreebsd-i386
+Archive-architecture: amd64 i386
 Archive-ftp: /pub/linux/debian/debian/
 Archive-http: /pub/linux/debian/debian/
 Archive-upstream: ftp.br.debian.org
@@ -4018,15 +4070,14 @@
 IPv6: no
 
 Site: ftp.gva.es
-Alias: frigga.gva.es
-Type: leaf
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Type: Push-Secondary
+Archive-architecture: amd64 i386 ia64 kfreebsd-amd64 kfreebsd-i386
 Archive-ftp: /mirror/debian/
 Archive-http: /mirror/debian/
-CDImage-ftp: /mirror/debian-cd/
-CDImage-http: /mirror/debian-cd/
-NonUS-http: /mirror/debian-non-US/
-Archive-upstream: ftp.de.debian.org
+X-CDImage-ftp: /mirror/debian-cd/
+X-CDImage-http: /mirror/debian-cd/
+X-NonUS-http: /mirror/debian-non-US/
+Archive-upstream: ftp.es.debian.org
 Maintainer: soporte_sit@gva.es
 Country: ES Spain
 Location: Valencia
@@ -4044,33 +4095,35 @@
 
 Site: debian.telecoms.bg
 Type: leaf
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-ftp: /debian/
 Archive-http: /debian/
 Archive-upstream: ftp.de.debian.org
 Maintainer: Rumen Svobodnikov <rumen@telecoms.bg>
 Country: BG Bulgaria
 Location: Varna, Bulgaria
-IPv6: no
+IPv6: yes
 
 Site: debian.fastbull.org
 Type: leaf
-Archive-architecture: amd64 i386 powerpc
+Archive-architecture: amd64 armhf i386 powerpc s390x
 Archive-http: /debian/
 Archive-ftp: /debian/
 Archive-upstream: ftp.de.debian.org
 CDImage-http: /debian-cd/
 CDImage-ftp: /debian-cd/
 CDImage-upstream: ftp.de.debian.org
+CDImage-upstream: ftp.ch.debian.org
 Maintainer: Roberto Bosticardo <staff@fastbull.org>
 Country: IT Italy
 Location: Torino
 Sponsor: top-ix http://www.top-ix.org/
+Bandwidth: 1Gbps
 IPv6: no
 
 Site: mirrors.tummy.com
 Type: leaf
-Archive-architecture: alpha amd64 arm hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-ftp: /debian/
 Archive-http: /debian/
 Archive-upstream: ftp.us.debian.org
@@ -4082,7 +4135,7 @@
 
 Site: debian.mirror.frontiernet.net
 Type: leaf
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-ftp: /debian/
 Archive-http: /debian/
 Archive-rsync: debian/
@@ -4097,7 +4150,7 @@
 
 Site: debian.netcologne.de
 Type: leaf
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-ftp: /debian/
 Archive-http: /debian/
 Archive-rsync: debian/
@@ -4107,6 +4160,10 @@
 Backports-rsync: debian-backports/
 Backports-upstream: syncproxy3.eu.debian.org
 Backports-method: push
+CDImage-ftp: /debian-cd/
+CDImage-http: /debian-cd/
+X-CDImage-rsync: debian-cd/
+CDImage-upstream: cdimage.debian.org
 Volatile-ftp: /debian-volatile/
 Volatile-http: /debian-volatile/
 Volatile-rsync: debian-volatile/
@@ -4114,20 +4171,20 @@
 Location: Koeln, Germany
 Country: DE Germany
 Maintainer: roland@debian.org, formorer@debian.org, zobel@debian.org
-IPv6: no
+IPv6: yes
 
 Site: artfiles.org
 Type: leaf
 Archive-ftp: /debian/
 Archive-http: /debian/
-Archive-architecture: amd64 i386 kfreebsd-amd64 kfreebsd-i386
+Archive-architecture: amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 
 Archive-upstream: ftp.de.debian.org
 Maintainer: Katrin Sobolewski <mirror@artfiles.org>
 Country: DE Germany
 Location: Hamburg
 Sponsor: Artfiels New Media GmbH http://www.artfiles.de
 Updates: once
-Comment: 100 Mbit/s bandwidth.
+Bandwidth: 100 Mbps
 IPv6: no
 
 Site: debian.intergenia.de
@@ -4135,7 +4192,7 @@
 Alias: debian.vserver.de
 Alias: debian.plusserver.de
 Type: leaf
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-http: /debian/
 Archive-rsync: debian-linux/debian/
 Archive-upstream: ftp.rfc822.org
@@ -4146,14 +4203,14 @@
 Location: 2x D?sseldorf/DE, 2x Frankfurt am Main/DE (loadbalanced)
 Sponsor: intergenia Webhosting AG http://www.intergenia.de
 Updates: every four hours (?)
-Comment: 1gbit/s at both locations.
+Bandwidth: 1Gbps
 IPv6: no
 
 Site: debian.pop-sc.rnp.br
 Alias: mirror.pop-sc.rnp.br
 Type: leaf
 Archive-http: /debian/
-Archive-architecture: amd64 i386 kfreebsd-amd64 kfreebsd-i386
+Archive-architecture: amd64 armhf i386 kfreebsd-amd64 kfreebsd-i386 s390x
 Archive-upstream: ftp.br.debian.org
 CDImage-http: /debian-cd/
 CDImage-architecture: amd64 i386
@@ -4163,6 +4220,7 @@
 Location: Florian&oacute;polis
 Sponsor: PoP-SC/RNP http://www.pop-sc.rnp.br/
 Comment: 2.5Gbps with RNP academic backbone at 2,5Gbps. 136Mps with BrasilTelcom ISP by RCT.
+Bandwidth: 136Mbps
 IPv6: yes
 
 Site: ftp.gul.uc3m.es
@@ -4170,12 +4228,12 @@
 Archive-ftp: /debian/
 Archive-http: /debian/
 Archive-rsync: debian/
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-upstream: syncproxy.eu.debian.org
 Maintainer: info@gul.uc3m.es
 Country: ES Spain
 Sponsor: Grupo de Usuarios de Linux - Universidad Carlos III de Madrid http://www.gul.uc3m.es/
-Comment: 100Mbps
+Bandwidth: 100Mbps
 IPv6: no
 
 Site: ftp.es.debian.org
@@ -4184,13 +4242,13 @@
 Archive-ftp: /debian/
 Archive-http: /debian/
 Archive-rsync: debian/
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel i386 ia64 kfreebsd-amd64 kfreebsd-i386 powerpc
 Archive-upstream: ftp.nl.debian.org
 Archive-method: push
 Maintainer: Javier Fernandez-Sanguino <jfs@debian.org>, junta@debian-es.org
 Country: ES Spain
 Sponsor: Hostalia http://www.hostalia.com/
-Comment: 100Mbps
+Bandwidth: 100Mbps
 IPv6: no
 
 Site: ftp.mipt.ru
@@ -4198,14 +4256,15 @@
 Type: leaf
 Archive-ftp: /debian/
 Archive-rsync: mirror/debian/
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-upstream: mirror.yandex.ru
 Security-ftp: /mirror/debian-security/
 Security-rsync: mirror/debian-security/
 Maintainer: Olleg Samoylov <olleg@mipt.ru>
 Country: RU Russia
 Updates: once
-Comment: One stage rsync with --delay-updates and --delete-after options.  100Mbits bandwidth.
+Comment: One stage rsync with --delay-updates and --delete-after options.
+Bandwidth: 100Mbits bandwidth.
 IPv6: no
 
 Site: debian.savoirfairelinux.net
@@ -4213,9 +4272,9 @@
 Type: leaf
 Archive-ftp: /debian/
 Archive-http: /debian/
-Archive-architecture: amd64 i386 kfreebsd-amd64 kfreebsd-i386 powerpc
+Archive-architecture: amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 powerpc s390x
 Archive-upstream: gulus.usherbrooke.ca
-CDImage-ftp: /debian-cd/
+X-CDImage-ftp: /debian-cd/
 CDImage-http: /pub/mirrors/debian-cd/
 CDImage-architecture: amd64 i386
 CDImage-upstream: cdimage.debian.org
@@ -4228,7 +4287,7 @@
 Site: debian.mirror.iweb.ca
 Alias: ftp2.ca.debian.org
 Type: Push-Primary
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-ftp: /debian/
 Archive-http: /debian/
 Archive-rsync: debian/
@@ -4236,14 +4295,14 @@
 Archive-method: push
 Backports-ftp: /debian-backports/
 Backports-http: /debian-backports/
-Backports-rsync:  debian-backports/
-Backports-upstream: backports-master.debian.org 
+Backports-rsync: debian-backports/
+Backports-upstream: backports-master.debian.org
 Security-ftp: /debian-security/
 Security-http: /debian-security/
 Security-upstream: ftp2.de.debian.org
 CDImage-ftp: /debian-cd/
 CDImage-http: /debian-cd/
-CDImage-rsync: debian-cd/
+X-CDImage-rsync: debian-cd/
 CDImage-upstream: cdimage.debian.org
 Volatile-ftp: /debian-volatile/
 Volatile-http: /debian-volatile/
@@ -4254,15 +4313,15 @@
 Country: CA Canada
 Location: Montreal
 Sponsor: iWeb http://www.iweb.ca/
-Comment: 100Mbit/s. Connected to various backbones: Teleglobe, Cogent,
+Bandwidth: 100Mbit/s. Connected to various backbones: Teleglobe, Cogent,
  Videotron and Peer1, and also to TORIX (Toronto Internet Exchange).
-IPv6: no
+IPv6: yes
 
 Site: cudlug.cudenver.edu
 Type: leaf
 X-Archive-ftp: /debian/
 X-Archive-http: /debian/
-X-Archive-architecture: alpha amd64 arm hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+X-Archive-architecture: amd64 hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
 X-CDImage-ftp: /debian-cd/
 X-CDImage-http: /debian-cd/
 CDImage-architecture: i386
@@ -4271,7 +4330,7 @@
 Country: US United States
 Location: Denver, Colorado
 Updates: 4 times a day (?)
-Comment: 55Mbit/s. Peered with some Internet2 sites.
+Bandwidth: 55Mbit/s. Peered with some Internet2 sites.
 IPv6: no
 X-Comment: machien offline; spaillar 6 Jun 2009
 
@@ -4279,49 +4338,27 @@
 Type: Push-Secondary
 Archive-ftp: /debian/
 Archive-http: /debian/
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-upstream: ftp.tw.debian.org
 Maintainer: Shan-Bin Chen <dreamerwolf.tw@gmail.com>
 Country: TW Taiwan
 Location: Tai-Tung
-Comment: 1Gbit/s.
+Bandwidth: 1Gbit/s.
 IPv6: no
 
 Site: debian.cruisix.net
 Type: Push-Secondary
-Archive-architecture: amd64 i386 powerpc
+Archive-architecture: amd64 i386
 Archive-ftp: /debian/
 Archive-http: /debian/
 Archive-upstream: ftp.de.debian.org
-Security-ftp: /debian-security/
-Security-http: /debian-security/
+X-Security-ftp: /debian-security/
+X-Security-http: /debian-security/
 Maintainer: Martin Eichenberg <hostmaster@cruisix.net>
 Country: DE Germany
 Location: Nuernberg
 Updates: twice
-Comment: 100Mbit/s
-IPv6: no
-
-Site: debian.ciencias.uchile.cl
-Type: leaf
-X-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
-X-Archive-http: /debian/
-X-Archive-upstream: ftp.br.debian.org
-Backports-http: /debian-backports/
-Backports-upstream: ftp.br.debian.org
-X-Security-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
-X-Security-http: /debian-security/
-X-Security-upstream: security.debian.org
-X-Volatile-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
-X-Volatile-http: /debian-volatile/
-X-Volatile-upstream: ftp.br.debian.org
-Old-architecture: alpha arm hppa i386 ia64 mips mipsel powerpc s390 sparc
-Old-http: /debian-archive/
-Old-upstream: archive.debian.org
-Maintainer: Ricardo Yanez <ricardo.yanez@calel.org>
-Country: CL Chile
-Location: Santiago
-Sponsor: Departamento de Fisica, Facultad de Ciencias, Universidad de Chile http://fisica.ciencias.uchile.cl/
+Bandwidth: 100Mbit/s
 IPv6: no
 
 Site: russell.cs.bilgi.edu.tr
@@ -4338,7 +4375,7 @@
 Location: Istanbul
 Sponsor: Istanbul Bilgi University - Department of Computer Science http://cs.bilgi.edu.tr/
 Updates: once
-Comment: 10Mbps
+Bandwidth: 10Mbps
 IPv6: no
 
 Site: mirror.scarlet-internet.nl
@@ -4353,19 +4390,21 @@
 
 Site: mmc.geofisica.unam.mx
 Type: leaf
-Archive-architecture: amd64 hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-ftp: /debian/
 Archive-http: /debian/
-Archive-upstream: debian.mirror.iweb.ca
+Archive-rsync: debian/
+Archive-upstream: ftp.mx.debian.org
 Maintainer: Antonio Carrillo Ledesma <antonio@mmc.geofisica.unam.mx>
 Country: MX Mexico
 Location: Mexico D.F.
-Sponsor:  Grupo de Modelacion Matematica y Computacional http://www.mmc.geofisica.unam.mx
+Sponsor: Grupo de Modelacion Matematica y Computacional http://www.mmc.geofisica.unam.mx
+Bandwidth: 100Mbps
 IPv6: no
 
 Site: debian.mirror.web4u.cz
 Type: leaf
-Archive-architecture: amd64 i386 kfreebsd-amd64 kfreebsd-i386
+Archive-architecture: amd64 armel armhf i386 s390x
 Archive-ftp: /
 Archive-http: /
 Archive-upstream: ftp.cz.debian.org
@@ -4373,11 +4412,11 @@
 Country: CZ Czech Republic
 Location: Prague
 Sponsor: Web4U http://www.web4u.cz/
-IPv6: no
+IPv6: yes
 
 Site: debian-cd.mirror.web4u.cz
 Type: leaf
-CDImage-ftp: /
+X-CDImage-ftp: /
 CDImage-http: /
 CDImage-upstream: ftp.hosteurope.de
 CDImage-architecture: amd64 i386
@@ -4385,14 +4424,14 @@
 Country: CZ Czech Republic
 Location: Prague
 Sponsor: Web4U http://www.web4u.cz/
-Comment: connected with 1Gbps for the Czech Republic
-IPv6: no
+Bandwidth: connected with 1Gbps for the Czech Republic
+IPv6: yes
 
 Site: debian.mirror.inra.fr
 Type: Push-Secondary
 Archive-ftp: /debian/
 Archive-http: /debian/
-Archive-architecture: amd64 arm armel i386 ia64 kfreebsd-amd64 kfreebsd-i386 powerpc sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-upstream: ftp.fr.debian.org
 CDImage-ftp: /debian-cd/
 CDImage-http: /debian-cd/
@@ -4409,7 +4448,7 @@
 Site: ftp.rrzn.uni-hannover.de
 Type: leaf
 Archive-ftp: /debian/debian/
-Archive-architecture: amd64 i386 ia64
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 CDImage-ftp: /debian/debian-cd/
 Security-ftp: /debian/debian-security/
 Archive-upstream: ftp.gwdg.de
@@ -4417,7 +4456,7 @@
 Country: DE Germany
 Location: Hannover
 Updates: once
-Comment: 1Gb-net
+Bandwidth: 1Gbps
 IPv6: no
 
 Site: mirror.inter.net.il
@@ -4433,17 +4472,18 @@
 Archive-http: /debian/
 Archive-rsync: debian/
 Archive-upstream: syncproxy.wna.debian.org
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Maintainer: Columbia Mirror Administrator <mirror-admin@columbia.edu>
 Country: US United States
 Location: New York, NY
 Sponsor: Columbia University http://www.columbia.edu
 Comment: Internet2
+Bandwidth: 2Gbps
 IPv6: no
 
 Site: ftp.vectranet.pl
 Type: Push-Secondary
-Archive-architecture: amd64 i386 kfreebsd-amd64 kfreebsd-i386
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-ftp: /debian/
 Archive-http: /debian/
 Archive-rsync: debian/
@@ -4451,13 +4491,13 @@
 Archive-method: push
 Backports-ftp: /debian-backports/
 Backports-http: /debian-backports/
-Backports-rsync:  debian-backports/
+Backports-rsync: debian-backports/
 Backports-upstream: ftp.be.debian.org
 Volatile-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
 Volatile-ftp: /debian-volatile/
 Volatile-http: /debian-volatile/
 Volatile-rsync: debian-volatile/
-Volatile-upstream: ftp.de.debian.org 
+Volatile-upstream: ftp.de.debian.org
 CDImage-architecture: amd64 i386
 CDImage-ftp: /debian-cd/
 CDImage-http: /debian-cd/
@@ -4467,14 +4507,14 @@
 Country: PL Poland
 Location: Slupsk
 Sponsor: Vectra http://www.vectra.pl
-Comment: 1Gbps
+Bandwidth: 1Gbps
 IPv6: no
 
 Site: debian.co.il
 Alias: debian.interhost.co.il
 Type: leaf
 Archive-http: /debian/
-Archive-architecture: amd64 i386 kfreebsd-amd64 kfreebsd-i386
+Archive-architecture: amd64 armhf i386 kfreebsd-amd64 kfreebsd-i386 s390x
 Archive-upstream: ftp.de.debian.org
 CDImage-http: /debian-cd/
 CDImage-upstream: cdimage.debian.org
@@ -4483,21 +4523,22 @@
 Country: IL Israel
 Location: Rishon Leziyon
 Sponsor: Interhost http://www.interhost.co.il/
-Comment: 100Mbps
+Bandwidth: 100Mbps
 IPv6: no
 
 Site: debian.thaios.net
 Type: leaf
-Archive-http: /debian/
-Archive-rsync: debian/
+X-Archive-http: /debian/
+X-Archive-rsync: debian/
 Archive-upstream: ftp.tw.debian.org
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
 Maintainer: kijakarn junda <admin@thaihealth.net>
 Country: TH Thailand
 Location: Bangkok
 Sponsor: Thai health network http://www.thaihealth.net
 Sponsor: Thai opensource network http://www.thaios.net
 Comment: at Internet backbone (CAT IDC), T1
+ missing many files, excludes project/, etc
 IPv6: no
 
 Site: debian.bsnet.se
@@ -4506,7 +4547,7 @@
 Archive-ftp: /debian/
 Archive-http: /debian/
 Archive-upstream: ftp.se.debian.org
-Archive-architecture: amd64 i386
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Maintainer: Martin Bagge <brother@bsnet.se>
 Country: SE Sweden
 Location: Ronneby
@@ -4517,28 +4558,29 @@
 Site: jane.uab.cat
 Alias: jane.uab.es
 Type: leaf
-CDImage-http: /debian-cd/
+X-CDImage-http: /debian-cd/
 Maintainer: Juan Ignacio Toledo Testa <tecnics@deic.uab.cat>
 Country: ES Spain
 Location: Bellaterra (BARCELONA)
 Sponsor: Departament d'Enginyeria de la Informacio i de les Comunicacions (UAB) http://www.deic.uab.cat
 IPv6: no
-X-Comment: mirror not realiable enough for Lenny ; spaillar 6 Jan 2009
+X-Comment: mirror not reliable enough for Lenny ; spaillar 6 Jan 2009
 
 Site: debian.charite.de
 Type: leaf
-Archive-architecture: i386 kfreebsd-amd64 kfreebsd-i386
-Archive-http: /debian/
+Archive-architecture: amd64 i386
+X-Archive-http: /debian/
 Archive-upstream: ftp.de.debian.org
 Maintainer: Ralf Hildebrandt <ralf.hildebrandt@charite.de>
 Country: DE Germany
 Location: Berlin
 Sponsor: Charite http://www.charite.de/
+Comment: doesn't include sources
 IPv6: no
 
 Site: debian.mirror.ac.za
 Type: leaf
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-ftp: /debian/
 Archive-http: /debian/
 Archive-rsync: debian/
@@ -4551,11 +4593,11 @@
 Security-http: /debian-security/
 Security-rsync: debian-security/
 Security-upstream: security.debian.org
-Maintainer: Patrick Holahan <admin@mirror.ac.za>
+Maintainer: Patrick Holahan <mirroradmin@tenet.ac.za>
 Country: ZA South Africa
-Location: Cape Town
+Location: Johannesburg
 Updates: once
-Comment: bandwidth 200Mbit/s
+Bandwidth: 10Gpbs
 IPv6: no
 Sponsor: TENET - Tertiary Education and Research Networks http://www.tenet.ac.za
 
@@ -4565,8 +4607,8 @@
 Archive-http: /debian/
 Archive-rsync: debian/
 Archive-upstream: ftp.tw.debian.org
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
-CDImage-ftp: /debian-cd/
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
+X-CDImage-ftp: /debian-cd/
 CDImage-http: /debian-cd/
 CDImage-rsync: debian-cd/
 Maintainer: Stephon Chen <LinuxTA@cs.nctu.edu.tw>
@@ -4580,7 +4622,7 @@
 Archive-http: /debian/
 Archive-rsync: /debian/
 Archive-upstream: mirrors.kernel.org
-Archive-architecture: amd64 i386 kfreebsd-amd64 kfreebsd-i386
+Archive-architecture: amd64 i386 kfreebsd-amd64 kfreebsd-i386 sparc
 Maintainer: p. sriram <sriram@iitm.ac.in>
 Country: IN India
 Location: Madras
@@ -4589,9 +4631,9 @@
 
 Site: ftp.jp.debian.org
 Alias: cdn.debian.or.jp
-Includes: 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
+Includes: dennou-q.gfd-dennou.org dennou-k.gfd-dennou.org dennou-h.gfd-dennou.org www.oyu-net.jp hanzubon.jp ftp.nara.wide.ad.jp
 Type: Push-Primary
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-ftp: /debian/
 Archive-http: /debian/
 Archive-upstream: hanzubon.jp
@@ -4614,32 +4656,17 @@
 Archive-ftp: /debian/
 Archive-http: /debian/
 Archive-upstream: ftp.ch.debian.org
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 mips mipsel powerpc s390x
 Maintainer: Boldizsar Bencsath <boldi@mail2007.crysys.hu>
 Country: HU Hungary
 Location: Budapest
 Sponsor: Laboratory of Cryptography and Systems Security (CrySyS), BME http://www.crysys.hu/
-Comment: 100Mbit/s bandwidth, connected to the GEANT network.
-IPv6: no
-
-Site: debian.ynet.sk
-Alias: mirror.ynet.sk
-Type: leaf
-Archive-ftp: /debian/
-Archive-http: /debian/
-Archive-rsync: debian/
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
-Archive-upstream: ftp.sk.debian.org
-Maintainer: sebastian@gentoo.sk, marek.zidek@ynet.sk
-Country: SK Slovakia
-Location: Bratislava
-Sponsor: Ynet http://www.ynet.sk/
-Comment: 1Gbit/s bandwidth
+Bandwidth: 100Mbit/s bandwidth, connected to the GEANT network.
 IPv6: no
 
 Site: mirrors.nfsi.pt
 Type: leaf
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-ftp: /debian/
 Archive-http: /debian/
 Archive-upstream: ftp.pt.debian.org
@@ -4654,8 +4681,8 @@
 
 Site: ftp.grokthis.net
 Type: leaf
-Archive-ftp: /debian/
-Archive-http: /debian/
+X-Archive-ftp: /debian/
+X-Archive-http: /debian/
 Archive-upstream: rsync.osuosl.org
 Archive-architecture: amd64 i386 kfreebsd-amd64 kfreebsd-i386
 Maintainer: Eric Windisch <eric@grokthis.net>
@@ -4666,53 +4693,66 @@
 
 Site: debian.eso-es.net
 Type: leaf
-Archive-http: /debian/
-Security-http: /debian-security/
-Archive-upstream: ftp.fi.debian.org
-Archive-architecture: amd64 i386 ia64 kfreebsd-amd64 kfreebsd-i386 sparc
+X-Archive-http: /debian/
+X-Security-http: /debian-security/
+X-Archive-upstream: ftp.fi.debian.org
+X-Archive-architecture: amd64 i386 ia64 kfreebsd-amd64 kfreebsd-i386 sparc
 Maintainer: Kerem Titiz <keremtitiz@eso-es.net>
 Country: TR Turkey
 Location: Eski&#351;ehir
 Sponsor: eso-es.net http://www.eso-es.net/
-Comment: Dual P4 3.0Ghz Cpu, 200Mbit/s
+Comment: Dual P4 3.0Ghz Cpu
+Bandwidth: 200Mbit/s
 IPv6: no
 
 Site: ftp.udc.es
 Type: leaf
 Archive-ftp: /debian/
 Archive-http: /debian/
-CDImage-ftp: /debian-cd/
-CDImage-http: /debian-cd/
+X-CDImage-ftp: /debian-cd/
+X-CDImage-http: /debian-cd/
 Archive-upstream: ftp.es.debian.org
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
 Maintainer: Andres J. Diaz Lopez <softwarelibre@udc.es>
 Country: ES Spain
 Location: A Coru&ntilde;a, Spain
 Sponsor: Free Software Office, University of A Coru&ntilde;a http://softwarelibre.udc.es
-Comment: 2Gbit/s, 2TB disk space, 2GB RAM.
+Comment: 2TB disk space, 2GB RAM.
+Bandwidth: 2Gbps
 IPv6: no
 
 Site: debian.csg.uzh.ch
 Type: leaf
 Archive-http: /debian/
-Security-http: /debian-security/
+Archive-ftp: /debian/
+X-Security-http: /debian-security/
 Archive-upstream: ftp.de.debian.org
-Archive-architecture: amd64 i386 kfreebsd-amd64 kfreebsd-i386
+Archive-architecture: amd64 armel armhf i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Maintainer: David Hausheer <hausheer@ifi.uzh.ch>
 Country: CH Switzerland
 Location: Zurich
 Sponsor: University of Zurich, Communication Systems Group http://www.csg.uzh.ch/
 Updates: once
-Comment: 1Gbit/s
+Bandwidth: 1Gbit/s
 IPv6: yes
 
 Site: ftp.sk.debian.org
 Type: Push-Primary
-Alias: ftp.debian.sk
+Includes: ftp.debian.sk
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
+Archive-ftp: /debian/
+Archive-http: /debian/
+Archive-rsync: debian/
+Archive-upstream: syncproxy3.eu.debian.org
+Archive-method: push
+Country: SK Slovakia
+IPv6: no
+
+Site: ftp.debian.sk
 Alias: debian.sk
 Alias: mirrors.nextra.sk
-Type: leaf
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Type: Push-Primary
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-ftp: /debian/
 Archive-http: /debian/
 Archive-rsync: debian/
@@ -4733,7 +4773,7 @@
 Location: Bratislava
 Sponsor: GTS Nextra http://www.gtsnextra.sk/
 Updates: twice
-Comment: 100Mbit/s
+Bandwidth: 100Mbit/s
 IPv6: no
 
 Site: ftp.cc.uoc.gr
@@ -4741,12 +4781,12 @@
 Archive-ftp: /mirrors/linux/debian/
 Archive-http: /mirrors/linux/debian/
 Archive-upstream: ftp.de.debian.org
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Maintainer: Kapetanakis Giannis <mirror@cc.uoc.gr>
 Country: GR Greece
 Location: Crete / Heraklion
 Sponsor: University of Crete / Computer Center http://www.cc.uoc.gr
-Comment: 1Gbps
+Bandwidth: 1Gbps
 IPv6: no
 
 Site: mirrors.uol.com.br
@@ -4769,21 +4809,21 @@
 Country: IL Israel
 Sponsor: ISOC-IL http://www.isoc.org.il
 Updates: twice
-Comment: 4Mbps
+Bandwidth: 4Mbps
 IPv6: no
 
 Site: debian.torredehanoi.org
 Type: leaf
-Archive-ftp: /debian/
-Archive-http: /debian/
-Archive-rsync: debian/
+X-Archive-ftp: /debian/
+X-Archive-http: /debian/
+X-Archive-rsync: debian/
 Archive-upstream: ftp.br.debian.org
-Archive-architecture: amd64 arm armel hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 powerpc
+Archive-architecture: amd64 armhf i386 ia64 s390x
 Maintainer: Luis Falcon <lfalcon@thymbra.com>
 Country: AR Argentina
 Location: Buenos Aires
 Sponsor: Thymbra - Departamento de I+D, Torre de Hanoi http://www.torredehanoi.org
-Comment: 10Mbps
+Bandwidth: 10Mbps
 IPv6: no
 
 Site: mirror.yandex.ru
@@ -4792,41 +4832,44 @@
 Archive-ftp: /debian/
 Archive-http: /debian/
 Archive-rsync: debian/
-CDImage-ftp: /debian-cd/
+X-CDImage-ftp: /debian-cd/
 CDImage-http: /debian-cd/
 CDImage-rsync: debian-cd/
 Security-ftp: /debian-security/
 Security-http: /debian-security/
 Security-rsync: debian-security/
+Backports-ftp: /debian-backports/
+Backports-http: /debian-backports/
+Backports-rsync: debian-backports/
 Archive-upstream: ftp.de.debian.org
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
-Maintainer: Arkady L. Shane <yandexmirror@gmail.com>
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
+Maintainer: opensource@yandex-team.ru
 Country: RU Russia
 Location: Moscow
 Sponsor: Yandex http://www.yandex.ru
 Updates: twice
-Comment: 1Gbps
-IPv6: no
+Bandwidth: 1Gbps
+IPv6: yes
 
 Site: mirrors.xenir.com
 Type: leaf
 Archive-http: /debian/
 Archive-upstream: ftp.egr.msu.edu
-Archive-architecture: amd64 arm armel i386 kfreebsd-amd64 kfreebsd-i386 powerpc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390x
 Maintainer: Clint Guillot <clint@xenir.com>
 Country: US United States
 Location: Charlottesville, Va.
 Updates: once
-Comment: 20Mbits
+Bandwidth: 20Mbits
 IPv6: no
 
 Site: mirrors.fe.up.pt
 Type: leaf
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-ftp: /debian/
 Archive-http: /debian/
 Archive-rsync: debian/
-Archive-upstream: ftp.pt.debian.org
+Archive-upstream: ftp.ie.debian.org
 Backports-ftp: /debian-backports/
 Backports-http: /debian-backports/
 Backports-rsync: debian-backports/
@@ -4834,14 +4877,20 @@
 CDImage-ftp: /debian-cd/
 CDImage-http: /debian-cd/
 CDImage-rsync: debian-cd/
-CDImage-upstream: ftp.de.debian.org
+CDImage-upstream: ftp.ie.debian.org
 Volatile-ftp: /debian-volatile/
 Volatile-http: /debian-volatile/
 Volatile-rsync: debian-volatile/
 Volatile-upstream: ftp.de.debian.org
+Old-ftp: /debian-archive/
+Old-http: /debian-archive/
+Old-rsync: debian-archive/
+Old-upstream: archive.debian.org
 Maintainer: mirrors@fe.up.pt
 Country: PT Portugal
 Location: Porto
+Sponsor: FEUP - University of Porto http://www.fe.up.pt
+Bandwidth: 1Gbps
 IPv6: yes
 
 Site: ftp.pwr.wroc.pl
@@ -4851,12 +4900,12 @@
 CDImage-ftp: /debian-cd/
 CDImage-http: /debian-cd/
 Archive-upstream: ftp.pl.debian.org
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Maintainer: Wroclaw Centre for Networking and Supercomputing <root@wcss.wroc.pl>
 Country: PL Poland
 Location: Wroclaw
 Updates: once
-Comment: 1Gbps
+Bandwidth: 1Gbps
 IPv6: no
 
 Site: cesium.di.uminho.pt
@@ -4865,32 +4914,21 @@
 Archive-http: /pub/debian/
 Archive-rsync: debian/
 Archive-upstream: ftp.ch.debian.org
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 i386
 Maintainer: Ruben Fonseca <caos@di.uminho.pt>
 Country: PT Portugal
 Location: Braga
 Sponsor: Universidade do Minho http://www.uminho.pt/
 Updates: twice
-Comment: 1.5TiB RAID5 array, 1Gbps to the world
-IPv6: no
-
-Site: postmortem.csd.auth.gr
-Type: leaf
-Archive-http: /debian/
-Archive-upstream: ftp.gr.debian.org
-Archive-architecture: amd64 i386
-Maintainer: Giorgos Pallas <gpall@ccf.auth.gr>
-Country: GR Greece
-Location: Thessaloniki
-Updates: once
-Comment: max. bandwidth: 100Mbps
+Comment: 1.5TiB RAID5 array
+Bandwidth: 1Gbps
 IPv6: no
 
 Site: debian.utalca.cl
 Type: leaf
 Archive-http: /debian/
 Archive-upstream: ftp.cl.debian.org
-Archive-architecture: amd64 i386
+Archive-architecture: amd64 armhf i386 s390x
 Maintainer: Alejandro Valdes <avaldes@utalca.cl>
 Country: CL Chile
 Location: Talca
@@ -4899,17 +4937,25 @@
 
 Site: ftp.debianclub.org
 Type: leaf
-Archive-architecture: amd64 i386 kfreebsd-amd64 kfreebsd-i386
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-ftp: /debian/
 Archive-http: /debian/
-Archive-upstream: ftp.es.debian.org
+Archive-upstream: ftp.th.debian.org
+Backports-ftp: /debian-backports/
+Backports-http: /debian-backports/
+Backports-upstream: ftp.th.debian.org
+CDImage-ftp: /debian-cd/
+CDImage-http: /debian-cd/
+CDImage-upstream: ftp.th.debian.org
+Volatile-ftp: /debian-volatile/
+Volatile-http: /debian-volatile/
+Volatile-upstream: ftp.th.debian.org
 Maintainer: Theppitak Karoonboonyanan <thep@linux.thai.net>
 Country: TH Thailand
 Location: Bangkok
 Sponsor: debianclub http://debianclub.org/
 Sponsor: Internet Thailand, PLC. http://www.inet.co.th/
 Sponsor: 101 Global, Co., Ltd. http://101g.com/
-Updates: twice
 IPv6: no
 
 Site: debian.med.univ-tours.fr
@@ -4917,44 +4963,44 @@
 Archive-ftp: /debian/
 Archive-http: /debian/
 Archive-rsync: debian/
-CDImage-ftp: /debian-cd/
-CDImage-http: /debian-cd/
+X-CDImage-ftp: /debian-cd/
+X-CDImage-http: /debian-cd/
 CDImage-rsync: debian-cd/
 Security-ftp: /debian-security/
 Security-http: /debian-security/
 Security-rsync: debian-security/
 Archive-upstream: ftp.fr.debian.org
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Maintainer: Virgile Aguillon <virgile.aguillon@univ-tours.fr>
 Country: FR France
 Location: Tours
 Sponsor: UFR Médecine de Tours http://www.med.univ-tours.fr
-Comment: 100Mbps bandwidth
+Bandwidth: 100Mbps
 IPv6: no
 
 Site: ftp.plusline.de
 Type: leaf
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-ftp: /pub/debian/
 Archive-http: /debian/
 Archive-rsync: debian/
-NonUS-ftp: /pub/debian-non-US/
-NonUS-http: /debian-non-US/
-NonUS-rsync: debian-non-US/
-Security-ftp: /pub/debian-security/
-Security-http: /debian-security/
-Security-rsync: debian-security/
+X-NonUS-ftp: /pub/debian-non-US/
+X-NonUS-http: /debian-non-US/
+X-NonUS-rsync: debian-non-US/
+X-Security-ftp: /pub/debian-security/
+X-Security-http: /debian-security/
+X-Security-rsync: debian-security/
 Archive-upstream: ftp2.de.debian.org
 Maintainer: Robert Klima and Martin Knipper <ftp-admin@plusline.de>
 Country: DE Germany
 Location: Frankfurt am Main
 Sponsor: Plus.line AG http://www.plusline.de/
-Comment: 100 Mbit connection at the DE-CIX-II
-IPv6: no
+Bandwidth: 100 Mbps at the DE-CIX-II
+IPv6: yes
 
 Site: ftp.man.poznan.pl
 Type: leaf
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-ftp: /pub/linux/debian/debian/
 Archive-http: /pub/linux/debian/debian/
 NonUS-ftp: /pub/linux/debian/debian-non-US/
@@ -4965,11 +5011,12 @@
 Location: Poznan
 Sponsor: Poznan Supercomputing and Networking Center http://www.psnc.pl/
 Updates: once
-Comment: bandwith for the server is 1Gb/s
+Bandwidth: 1Gb/s
 IPv6: yes
 
 Site: ftp.ula.ve
 Type: leaf
+X-Archive-http: /debian/
 Maintainer: Ivan Cañizares <tickcia@ula.ve>
 Country: VE Venezuela
 Location: Merida
@@ -4993,11 +5040,11 @@
 
 Site: debian.dynamica.it
 Type: leaf
-Archive-architecture: amd64 hurd-i386 i386 ia64 powerpc
+Archive-architecture: amd64 armel armhf i386 powerpc s390x
 Archive-ftp: /debian/
 Archive-http: /debian/
-CDImage-ftp: /images-i386/
-CDImage-http: /images-i386/
+X-CDImage-ftp: /images-i386/
+X-CDImage-http: /images-i386/
 Security-ftp: /debian-security/
 Security-http: /debian-security/
 NonUS-ftp: /debian-non-US/
@@ -5013,7 +5060,7 @@
 
 Site: debian.mnet.bg
 Type: leaf
-Archive-architecture: amd64 i386
+Archive-architecture: armhf i386 s390x
 Archive-ftp: /debian/
 Archive-http: /debian/
 Security-ftp: /debian-security/
@@ -5030,7 +5077,7 @@
 Site: debian.mirrors.easynews.com
 Alias: mirrors.easynews.com
 Type: leaf
-Archive-architecture: amd64 i386 kfreebsd-amd64 kfreebsd-i386
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-http: /linux/debian/
 Archive-rsync: debian/
 Archive-upstream: ftp.us.debian.org
@@ -5044,7 +5091,7 @@
 Site: debian.sth.sze.hu
 Alias: mirrors.sth.sze.hu
 Type: leaf
-Archive-architecture: amd64 i386 ia64
+Archive-architecture: amd64 armhf i386 s390x
 Archive-ftp: /debian/
 Archive-http: /debian/
 Archive-upstream: ftp.hu.debian.org
@@ -5066,12 +5113,13 @@
 Country: TW Taiwan
 Location: Puli, Nantou
 Sponsor: National Chi Nan University http://www.ncnu.edu.tw/
-Comment: 100Mbps Ethernet, Machine: Pentium III 1133MHz, 2GB RAM, 4TB RAID.
+Comment: Machine: Pentium III 1133MHz, 2GB RAM, 4TB RAID.
+Bandwidth: 100Mbps
 IPv6: yes
 
 Site: debian.netvisao.pt
 Type: leaf
-Archive-architecture: amd64 hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 powerpc sparc
+Archive-architecture: amd64 i386 ia64 kfreebsd-amd64 kfreebsd-i386 sparc
 Archive-ftp: /debian/
 Archive-http: /
 Archive-upstream: ftp.pt.debian.org
@@ -5083,20 +5131,20 @@
 
 Site: mirror.units.it
 Type: leaf
-Archive-architecture: amd64 i386 kfreebsd-amd64 kfreebsd-i386
+Archive-architecture: amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386
 Archive-http: /debian/
 Archive-upstream: debian.fastweb.it
 Maintainer: CSIA <rete@units.it>
 Country: IT Italy
 Location: Trieste
 Sponsor: University of Trieste http://www.units.it/
-Comment: 100Mbps
-IPv6: no
+Bandwidth: 100Mbps
+IPv6: yes
 
 Site: mirrors.acm.jhu.edu
 Alias: astrolabe.acm.jhu.edu
 Type: leaf
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
 Archive-http: /debian/
 Archive-upstream: debian.lcs.mit.edu
 Maintainer: admins@acm.jhu.edu
@@ -5106,31 +5154,17 @@
 Comment: fast for Internet2, JHU or JHMI users
 IPv6: no
 
-Site: ftp.uga.edu
-Alias: linuxserv.uga.edu
-Type: leaf
-Archive-architecture: i386
-Archive-ftp: /debian/
-Archive-http: /debian/
-Archive-upstream: debian.lcs.mit.edu
-Maintainer: Stuart Freeman <stuartf@uga.edu>
-Country: US United States
-Location: Athens, GA
-Sponsor: University of Georgia http://www.uga.edu/
-Updates: once
-IPv6: no
-
 Site: debian-iso.mirror.anlx.net
 Type: leaf
 CDImage-http: /
 CDImage-ftp: /
-CDImage-architecture: amd64 arm i386 ia64 powerpc sparc
+CDImage-architecture: amd64 i386 ia64 powerpc sparc
 CDImage-upstream: rsync.mirrorservice.org, cdimage.debian.org
 Maintainer: mirror@anlx.net
-Country: GB Great Britain
+Country: GB United Kingdom
 Location: Telehouse East, London
 Sponsor: Associated Networks Ltd http://www.anlx.net/
-Comment: connected at 100Mbps
+Bandwidth: 100Mbps
 IPv6: no
 
 Site: debian.dcc.fc.up.pt
@@ -5145,16 +5179,16 @@
 Location: Porto, Campo Alegre
 Sponsor: Departamento de Ciência de Computadores da Faculdade de Ciências da Universidade do Porto http://dcc.fc.up.pt/
 Updates: once
-Comment: The available bandwidth is 100Mbps
+Bandwidth: 100Mbps
 IPv6: no
 
 Site: mirror.cse.unsw.edu.au
 Type: leaf
-Archive-architecture: amd64 i386 ia64 kfreebsd-amd64 kfreebsd-i386 powerpc
+Archive-architecture: amd64 armel armhf i386 ia64 kfreebsd-amd64 kfreebsd-i386 powerpc s390x
 Archive-ftp: /debian/
 Archive-http: /debian/
-CDImage-ftp: /debian-cd/
-CDImage-http: /debian-cd/
+X-CDImage-ftp: /debian-cd/
+X-CDImage-http: /debian-cd/
 Security-ftp: /debian-security/
 Security-http: /debian-security/
 Archive-upstream: ftp.wa.au.debian.org
@@ -5165,28 +5199,54 @@
 IPv6: no
 
 Site: ftp.au.debian.org
-Alias: mirror.linux.org.au
+Includes: mirror.linux.org.au
 Type: Push-Primary
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-ftp: /debian/
 Archive-http: /debian/
 Archive-rsync: debian/
 Archive-upstream: syncproxy.wna.debian.org
-Backports-ftp: /backports.org/
-Backports-http: /backports.org/
-Backports-rsync: backports.org/
+IPv6: yes
+Country: AU Australia
+
+Site: mirror.linux.org.au
+Type: Push-Primary
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
+Archive-ftp: /debian/
+Archive-http: /debian/
+Archive-rsync: debian/
+Archive-upstream: syncproxy.wna.debian.org
+X-Backports-ftp: /backports.org/
+X-Backports-http: /backports.org/
+X-Backports-rsync: backports.org/
 Backports-upstream: syncproxy.backports.org
-IPv6: no
-Maintainer: Linux Australia Mirror Admins <admin@mirror.linux.org.au>
+IPv6: yes
+Maintainer: Linux Australia Mirror Admins <admin@mirror.linux.org.au>, Andrew Pollock <me@andrew.net.au>
 Country: AU Australia
 Location: Canberra
 Sponsor: Linux Australia http://www.linux.org.au/
 
+Site: mirror.overthewire.com.au
+Type: leaf
+Archive-architecture: amd64 i386
+Archive-ftp: /debian/
+Archive-http: /debian/
+CDImage-ftp: /debian-cd/
+CDImage-http: /debian-cd/
+IPv6: no
+Archive-upstream: ftp1.us.debian.org
+CDImage-upstream: cdimage.debian.org
+Updates: four
+Maintainer: James Paussa <james@overthewire.com.au>
+Country: AU Australia
+Sponsor: Over The Wire http://www.overthewire.com.au
+Bandwidth: 1Gbps
+
 Site: ftp.ee.debian.org
 Alias: ftp.aso.ee
 Alias: ftp.ria.ee
 Type: Push-Primary
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-ftp: /debian/
 Archive-http: /debian/
 Archive-rsync: debian/
@@ -5201,11 +5261,11 @@
 Country: EE Estonia
 Sponsor: Estonian Informatics Centre http://www.ria.ee/
 IPv6: no
-Comment: bandwidth 100 Mbit/s for Estonian ISPs
+Bandwidth: 100 Mbit/s for Estonian ISPs
 
 Site: mirror.csclub.uwaterloo.ca
 Type: leaf
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-ftp: /debian/
 Archive-http: /debian/
 Archive-rsync: debian/
@@ -5227,15 +5287,19 @@
 Location: Waterloo, Ontario
 Sponsor: University of Waterloo Computer Science Club http://csclub.uwaterloo.ca/
 Comment: 1 Gbps over CA*Net/Internet2, 300 Mbps otherwise
+Bandwidth: 300 Mbps
 
 Site: debian.grn.cat
 Alias: ftp.grn.es
 Alias: ftp.grn.cat
 Type: leaf
-Archive-architecture: amd64 i386 ia64 kfreebsd-amd64 kfreebsd-i386 powerpc
+Archive-architecture: amd64 armhf i386 ia64
 Archive-http: /debian/
 Archive-ftp: /debian/
 Archive-upstream: ftp.es.debian.org
+Backports-ftp: /debian-backports/
+Backports-http: /debian-backports/
+Backports-upstream: ftp.de.debian.org
 Security-architecture: amd64 i386 ia64 powerpc
 Security-ftp: /debian-security/
 Security-http: /debian-security/
@@ -5245,16 +5309,27 @@
 Volatile-http: /debian-volatile/
 Volatile-upstream: ftp.de.debian.org
 Updates: twice
-Maintainer: GRN <info@grn.cat>, admin@grn.es
+Maintainer: GRN <info@grn.cat>, admin@grn.es, Joan Juvanteny <admin@grn.cat>
 Country: ES Spain
 Sponsor: GRN Serveis Telematics S.L. http://www.grn.cat/
-Comment: 100Mbps connection
+Bandwidth: 100Mbps
 IPv6: no
 
 Site: ftp.be.debian.org
-Alias: mirror.be.gbxs.net
+Includes: mirror.be.gbxs.net
+Type: Push-Secondary
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
+Archive-ftp: /debian/
+Archive-http: /debian/
+Archive-rsync: debian/
+Archive-upstream: ftp.nl.debian.org
+Archive-method: push
+IPv6: yes
+Country: BE Belgium
+
+Site: mirror.be.gbxs.net
 Type: Push-Secondary
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-ftp: /debian/
 Archive-http: /debian/
 Archive-rsync: debian/
@@ -5267,7 +5342,7 @@
 Backports-method: push
 CDImage-ftp: /debian-cd/
 CDImage-http: /debian-cd/
-CDImage-rsync: debian-cd/
+X-CDImage-rsync: debian-cd/
 CDImage-upstream: cdimage.debian.org
 Volatile-ftp: /debian-volatile/
 Volatile-http: /debian-volatile/
@@ -5282,19 +5357,19 @@
 Maintainer: Kurt Roeckx <kurt@roeckx.be>
 Country: BE Belgium
 Sponsor: Globalaxs http://www.globalaxs.com/
-Comment: It has a gigabit connection to the backbone.
+Bandwidth: 1 Gbps
 
 Site: mirror.in.th
 Type: leaf
-X-Archive-architecture: alpha amd64 arm hppa i386 ia64 mips mipsel powerpc s390 sparc
+X-Archive-architecture: amd64 i386 ia64 mips mipsel powerpc s390 sparc
 X-Archive-ftp: /debian/
 X-Archive-http: /debian/
 X-Archive-rsync: all/debian/
 X-Archive-upstream: mirrors.usc.edu
-CDImage-ftp: /debian_cd/
-CDImage-http: /debian_cd/
-CDImage-rsync: all/debian_cd/
-CDImage-upstream: mirrors.usc.edu
+X-CDImage-ftp: /debian_cd/
+X-CDImage-http: /debian_cd/
+X-CDImage-rsync: all/debian_cd/
+X-CDImage-upstream: mirrors.usc.edu
 Maintainer: mirror.in.th@gmail.com
 Country: TH Thailand
 Sponsor: Thai National Mirror http://mirror.in.th/
@@ -5304,36 +5379,37 @@
 
 Site: mirror.steadfast.net
 Type: leaf
-Archive-architecture: amd64 i386 kfreebsd-amd64 kfreebsd-i386
+Archive-architecture: amd64 armhf i386 kfreebsd-amd64 kfreebsd-i386 s390x
 Archive-http: /debian/
 CDImage-http: /debian-cd/
 Security-http: /debian-security/
-IPv6: no
+IPv6: yes
 Archive-upstream: mirror.cs.wisc.edu
 Maintainer: Kevin Stange <mirror@steadfast.net>
 Country: US United States
 Location: Chicago, IL
 Sponsor: Steadfast Networks http://steadfast.net/
 Comment: Uncapped connection for local users, ~60 Mbps for public use.
+Bandwidth: 60 Mbps
 IPv6: no
 
 Site: ftp.univ-nantes.fr
 Alias: vacuum.univ-nantes.fr
 Type: Push-Secondary
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-ftp: /debian/
 X-CDImage-ftp: /debian-cd/
 Archive-upstream: ftp.fr.debian.org
 Maintainer: Yann Dupont <Yann.Dupont@univ-nantes.fr>
 Country: FR France
 Sponsor: University of Nantes http://www.univ-nantes.fr/
-Comment: 100 Mbps dedicated to IPv4, 55 Mbps dedicated to IPv6
+Bandwidth: 100 Mbps dedicated to IPv4, 55 Mbps dedicated to IPv6
 IPv6: yes
 
 Site: debian.com.es
 Alias: selene.servytec.es
 Type: leaf
-Archive-architecture: alpha amd64 arm armel hppa i386 ia64 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel i386 ia64 kfreebsd-amd64 kfreebsd-i386 powerpc
 X-Archive-ftp: /debian/
 X-Archive-http: /debian/
 IPv6: no
@@ -5347,7 +5423,7 @@
 Site: debian.ues.edu.sv
 Alias: linux.ues.edu.sv
 Type: leaf
-Archive-architecture: amd64 i386 ia64 kfreebsd-amd64 kfreebsd-i386
+Archive-architecture: amd64 armhf i386 ia64 kfreebsd-amd64 kfreebsd-i386 s390x
 X-Archive-ftp: /debian/
 Archive-http: /debian/
 Archive-upstream: ftp.us.debian.org
@@ -5362,7 +5438,7 @@
 Site: debian.lth.se
 Alias: ftp.ddg.lth.se
 Type: Push-Secondary
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-ftp: /debian/
 Archive-http: /debian/
 IPv6: no
@@ -5370,29 +5446,12 @@
 Maintainer: Per Foreby <perf@ddg.lth.se>
 Country: SE Sweden
 Updates: once
-Comment: 1 Gbps
-
-Site: debian.topstudio.co.jp
-Type: Push-Secondary
-X-Archive-architecture: alpha amd64 arm hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
-X-Archive-http: /debian/
-X-Archive-rsync: debian/
-Archive-upstream: hanzubon.jp
-Backports-ftp: /debian-backports/
-Backports-http: /debian-backports/
-Backports-rsync: debian-backports/
-Backports-upstream: hanzubon.jp
-Backports-method: push
-IPv6: no
-Maintainer: Kenshi Muto <kmuto@debian.org>
-Country: JP Japan
-Sponsor: Topstudio Corporation http://www.topstudio.co.jp/
-Comment: One of the cdn.debian.or.jp backends. Please access via cdn.debian.or.jp.
+Bandwidth: 1 Gbps
 
 Site: hanzubon.jp
 Alias: air.hanzubon.jp
 Type: Push-Primary
-X-Archive-architecture: alpha amd64 arm hppa i386 ia64 mips mipsel powerpc s390 sparc
+X-Archive-architecture: amd64 i386 ia64 mips mipsel powerpc s390 sparc
 X-Archive-http: /debian/
 X-Archive-rsync: debian/
 X-Backports-ftp: /debian-backports/
@@ -5413,7 +5472,7 @@
 
 Site: www.oyu-net.jp
 Type: Push-Secondary
-X-Archive-architecture: alpha amd64 arm hppa i386 ia64 mips mipsel powerpc s390 sparc
+X-Archive-architecture: amd64 i386 ia64 mips mipsel powerpc s390 sparc
 X-Archive-http: /debian/
 X-Archive-rsync: debian/
 IPv6: no
@@ -5425,27 +5484,33 @@
 
 Site: ftp.df.lth.se
 Type: leaf
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-ftp: /debian/
 Archive-http: /debian/
 Archive-rsync: debian/
 Archive-upstream: ftp.se.debian.org
+Backports-http: /debian-backports/
+Backports-rsync: debian-backports/
+Backports-upstream: ftp.de.debian.org
+Backports-method: push
 CDImage-ftp: /debian-cd/
 CDImage-http: /debian-cd/
-CDImage-rsync: debian-cd/
-CDImage-upstream: cdimage.debian.org
+CDImage-rsync: debian-iso/
+CDImage-upstream: ftp.se.debian.org
+Old-ftp: /debian-archive/
+Old-http: /debian-archive/
 IPv6: no
 Maintainer: Tobias Lundquist and Hakan Kvist <ftp@df.lth.se>
 Country: SE Sweden
 Location: Lund, Sweden
-Sponsor: DF - the Computer Society at  Lund University and Lund Institute of Technology http://df.lth.se/
-Comment: 100Mbps connection, planned upgrade to 1Gbps in spring 2008.
+Sponsor: DF - the Computer Society at Lund University and Lund Institute of Technology http://df.lth.se/
+Bandwidth: 1Gbps
 
 Site: debian.forpro-creteil.org
 Type: leaf
 CDImage-architecture: i386
-CDImage-ftp: /debian-cd/
-CDImage-http: /debian-cd/
+X-CDImage-ftp: /debian-cd/
+X-CDImage-http: /debian-cd/
 CDImage-rsync: debian-cd/
 CDImage-upstream: cdimage.debian.org
 Maintainer: Antonin Hily <antonin.hily@gmail.com>
@@ -5457,7 +5522,7 @@
 
 Site: debian2.forpro-creteil.org
 Type: leaf
-Archive-architecture: i386
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 X-CDImage-ftp: /debian-cd/
 X-CDImage-http: /debian-cd/
 CDImage-rsync: debian-cd/
@@ -5472,9 +5537,9 @@
 
 Site: www.cohsoft.com
 Type: leaf
-Archive-architecture: amd64 hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 powerpc
-Archive-http: /debian/
-Archive-upstream: ftp2.jp.debian.org
+X-Archive-architecture: amd64 hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 powerpc
+X-Archive-http: /debian/
+X-Archive-upstream: ftp2.jp.debian.org
 Maintainer: Koutarou TAKAHASHI <takahashi@mail.garnetsoft.biz>
 Country: JP Japan
 Location: Kanagawa
@@ -5494,7 +5559,6 @@
 
 Site: backports.debian.or.at
 Type: Push-Primary
-Backports-architecture: alpha amd64 arm hppa i386 ia64 mips mipsel powerpc s390 sparc
 Backports-http: /debian-backports/
 Backports-rsync: debian-backports/
 Backports-upstream: syncproxy3.eu.debian.org
@@ -5509,7 +5573,7 @@
 Volatile-http: /debian-volatile/
 Volatile-rsync: debian-volatile/
 Maintainer: Gavin Westwood <webmaster@solutium.co.uk>
-Country: GB Great Britain
+Country: GB United Kingdom
 Location: London
 Sponsor: Solutium http://www.solutium.co.uk/
 Updates: once
@@ -5518,7 +5582,7 @@
 Site: dennou-h.gfd-dennou.org
 Alias: dennou-h.ees.hokudai.ac.jp
 Type: Push-Secondary
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-ftp: /debian/
 Archive-http: /debian/
 Archive-upstream: hanzubon.jp
@@ -5531,7 +5595,7 @@
 
 Site: ftp.ceid.upatras.gr
 Type: leaf
-Archive-architecture: alpha amd64 arm hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
 X-Archive-ftp: /pub/debian/
 X-Archive-http: /pub/debian/
 X-Archive-rsync: debian/
@@ -5540,7 +5604,7 @@
 Maintainer: UNIX GRP @ CEID <unixgrp@ceid.upatras.gr>
 Country: GR Greece
 Updates: twice
-Comment: 1Gbps
+Bandwidth: 1Gbps
 X-comment: outdated since Jan 2008 (spaillar on 5th may 2008)
 
 Site: mirror.debianforum.de
@@ -5556,19 +5620,19 @@
 Alias: ftp.man.oswiecim.pl
 Type: leaf
 Archive-architecture: amd64 i386
-Archive-ftp: /pub/mirrors/debian/
-Archive-http: /pub/mirrors/debian/
-Archive-rsync: debian/
+X-Archive-ftp: /pub/mirrors/debian/
+X-Archive-http: /pub/mirrors/debian/
+X-Archive-rsync: debian/
 Archive-upstream: debian.balt.net
-CDImage-ftp: /pub/mirrors/debian-cd/
-CDImage-http: /pub/mirrors/debian-cd/
-CDImage-rsync: debian-cd/
+X-CDImage-ftp: /pub/mirrors/debian-cd/
+X-CDImage-http: /pub/mirrors/debian-cd/
+X-CDImage-rsync: debian-cd/
 CDImage-upstream: debian.inode.at
-Volatile-ftp: /pub/mirrors/debian-volatile/
-Volatile-http: /pub/mirrors/debian-volatile/
-Volatile-rsync: debian-volatile/
+X-Volatile-ftp: /pub/mirrors/debian-volatile/
+X-Volatile-http: /pub/mirrors/debian-volatile/
+X-Volatile-rsync: debian-volatile/
 Volatile-upstream: volatile.debian.net
-IPv6: no
+IPv6: yes
 Updates: once
 Maintainer: Piotr Maluty <piotr.maluty_at_gmail.com>
 Country: PL Poland
@@ -5594,7 +5658,7 @@
 Volatile-http: /debian-volatile/
 Volatile-rsync: debian-volatile/
 Volatile-upstream: kassia.debian.org
-IPv6: no
+IPv6: yes
 Maintainer: Robin Schroeder <mirror@ids-services.de>
 Country: DE Germany
 Location: Nuremberg, Germany
@@ -5603,25 +5667,27 @@
 
 Site: ftp.netspace.net.au
 Type: leaf
-Archive-architecture: alpha amd64 arm armel hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
-Archive-ftp: /pub/debian/
-Archive-http: /pub/debian/
+Archive-architecture: amd64 armel i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+X-Archive-ftp: /pub/debian/
+X-Archive-http: /pub/debian/
 Archive-upstream: ftp.au.debian.org
 Maintainer: Andy Saykao <helpdesk@netspace.net.au>
 Country: AU Australia
 Location: Melbourne
 Sponsor: Netspace Online Systems http://www.netspace.net.au/
+Comment: CNAME to ftp.iinet.net.au
 
 Site: mirrors.compuscene.org
 Alias: ns34892.ovh.net
 Type: leaf
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel i386
+Archive-ftp: /debian/
 Archive-http: /debian/
 Archive-upstream: ftp.fr.debian.org
 Maintainer: Vincent VAN HOLLEBEKE <administrateur@compuscene.org>
 Country: FR France
 Sponsor: Compuscene.org http://www.compuscene.org/
-Comment: 100Mbps
+Bandwidth: 100Mbps
 
 Site: watson.zp.ua
 Type: leaf
@@ -5635,7 +5701,7 @@
 Site: mirror.ayous.org
 Alias: sinclair.farm.ftbfs.de
 Type: leaf
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-ftp: /debian/
 Archive-http: /debian/
 Archive-rsync: debian/
@@ -5658,12 +5724,12 @@
 Site: ftp.cse.yzu.edu.tw
 Alias: ftp.oss.tw
 Type: leaf
-Archive-architecture: alpha amd64 arm armel hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
 Archive-ftp: /pub/Linux/debian/debian/
 Archive-http: /pub/Linux/debian/debian/
 Archive-upstream: ftp.tw.debian.org
-CDImage-ftp: /pub/Linux/debian/debian-cd/
-CDImage-http: /pub/Linux/debian/debian-cd/
+X-CDImage-ftp: /pub/Linux/debian/debian-cd/
+X-CDImage-http: /pub/Linux/debian/debian-cd/
 Maintainer: Cheng-Yu, Wang <yzcswang@gmail.com>
 Country: TW Taiwan
 Location: Taoyuan, Taiwan
@@ -5672,7 +5738,7 @@
 Site: ftp.ca.debian.org
 Includes: debian.mirror.iweb.ca ftp3.nrc.ca debian.mirror.rafal.ca
 Type: Push-Primary
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-http: /debian/
 Archive-ftp: /debian/
 Archive-rsync: debian/
@@ -5687,7 +5753,7 @@
 Alias: debian.antik.sk
 Alias: ubuntu.antik.sk
 Type: leaf
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-ftp: /debian/
 Archive-http: /debian/
 Archive-rsync: debian/
@@ -5695,7 +5761,7 @@
 CDImage-architecture: amd64 i386
 CDImage-ftp: /debian-cd/
 CDImage-http: /debian-cd/
-CDImage-rsync: debian-cd/
+X-CDImage-rsync: debian-cd/
 CDImage-upstream: cdimage.debian.org
 Volatile-architecture: alpha amd64 arm hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
 Volatile-ftp: /debian-volatile/
@@ -5708,11 +5774,11 @@
 Country: SK Slovakia
 Location: Kosice
 Sponsor: Antik Computer & Communications http://www.antik.sk
-Comment: 1Gbps
+Bandwidth: 1Gbps
 
 Site: debian.revolsys.fr
 Type: leaf
-Archive-architecture: amd64 i386 kfreebsd-amd64 kfreebsd-i386 powerpc
+Archive-architecture: amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 powerpc s390x
 Archive-ftp: /debian/
 Archive-http: /debian/
 Archive-upstream: ftp.fr.debian.org
@@ -5722,14 +5788,14 @@
 Country: FR France
 Location: Strasbourg
 Sponsor: RevolSyS Interactive http://www.revolsys.fr/
-Comment: 100Mbit/s
+Bandwidth: 100Mbps
 
 Site: ftp.is.co.za
 Type: leaf
 Archive-ftp: /debian/
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
 Archive-upstream: ftp.uk.debian.org
-CDImage-ftp: /debian-cd/
+X-CDImage-ftp: /debian-cd/
 Maintainer: IS FTP Admin <ftpadmin@is.co.za>
 Country: ZA South Africa
 
@@ -5738,8 +5804,8 @@
 Archive-architecture: amd64 i386
 Archive-http: /debian/
 Archive-upstream: ftp.ch.debian.org
-Security-http: /debian-security/
-Security-upstream: ftp.ch.debian.org
+X-Security-http: /debian-security/
+X-Security-upstream: ftp.ch.debian.org
 IPv6: no
 Updates: once
 Maintainer: Dr Johann A. Briffa <johann.briffa@um.edu.mt>
@@ -5751,11 +5817,11 @@
 Site: ftp.utexas.edu
 Alias: ftp.the.net
 Type: leaf
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armhf i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390x sparc
 X-Archive-ftp: /pub/debian/
 Archive-http: /debian/
 Archive-rsync: debian/
-X-CDImage-ftp: /pub/debian-cd/
+CDImage-ftp: /pub/debian-cd/
 CDImage-http: /debian-cd/
 CDImage-rsync: debian-cd/
 IPv6: no
@@ -5765,15 +5831,15 @@
 Maintainer: UTnet <mirrors@argus.gw.utexas.edu>
 Country: US United States
 Sponsor: The University of Texas at Austin http://www.utexas.edu
-Comment: 10Mbps access for external users, 1Gbps access for UT users
+Bandwidth: 10Mbps access for external users, 1Gbps access for UT users
 
 Site: mirror.fdcservers.net
 Type: leaf
-Archive-architecture: amd64 i386 kfreebsd-amd64 kfreebsd-i386
+Archive-architecture: amd64 armhf i386 kfreebsd-amd64 kfreebsd-i386 s390x
 Archive-ftp: /debian/
 Archive-http: /debian/
-Security-ftp: /debian-security/
-Security-http: /debian-security/
+X-Security-ftp: /debian-security/
+X-Security-http: /debian-security/
 IPv6: no
 Archive-upstream: mirrors.kernel.org
 Security-upstream: security.debian.org
@@ -5782,11 +5848,11 @@
 Country: US United States
 Location: Chicago Illinois
 Sponsor: FDCServers.net LLC http://www.fdcservers.net
-Comment: 1Gbps
+Bandwidth: 1Gbps
 
 Site: debian.univ-reims.fr
 Type: leaf
-Archive-architecture: amd64 i386 kfreebsd-amd64 kfreebsd-i386
+Archive-architecture: amd64 armhf i386 kfreebsd-amd64 kfreebsd-i386 s390x
 Archive-ftp: /debian/
 Archive-http: /debian/
 Archive-upstream: ftp.fr.debian.org
@@ -5802,7 +5868,7 @@
 Country: FR France
 Location: Reims
 Sponsor: Universite Reims Champagne-Ardenne http://www.univ-reims.fr/
-Comment: 70Mbps
+Bandwidth: 70Mbps
 
 Site: debian.networx-bg.com
 Type: leaf
@@ -5821,28 +5887,12 @@
 Country: BG Bulgaria
 Location: Rousse
 Sponsor: Networx-BG LTD http://www.networx-bg.com/
-Comment: 1.5Gbps
-
-Site: ftp.si.debian.org
-Alias: debian.prunk.si
-Type: Push-Secondary
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
-Archive-ftp: /debian/
-Archive-http: /debian/
-Archive-rsync: debian/
-IPv6: yes
-Archive-upstream: kassia.debian.org
-Updates: push
-Maintainer: Jan Prunk <jan@prunk.si>
-Country: SI Slovenia
-Location: Ljubljana
-Sponsor: VServer http://www.vserver.si
-Comment: 50Mbps
+Bandwidth: 1.5Gbps
 
 Site: mirror.mirohost.net
 Alias: deb.mirohost.net
 Type: leaf
-Archive-architecture: amd64 i386
+Archive-architecture: amd64 armhf i386 s390x
 Archive-ftp: /debian/
 Archive-http: /debian/
 Archive-rsync: debian/
@@ -5853,33 +5903,33 @@
 Country: UA Ukraine
 Location: Ukraine, Kyiv
 Sponsor: mirohost.net http://mirohost.net
-Comment: 100Mbps to Ukraine, 5Mbps other countries
+Bandwidth: 100Mbps to Ukraine, 5Mbps other countries
 
 Site: www.anheng.com.cn
 Alias: debian.bjlx.org.cn
 Alias: www.watertest.com.cn
 Alias: www.anheng.com.cn
 Type: leaf
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armhf i386 kfreebsd-amd64 mips mipsel powerpc
 Archive-ftp: /debian/
 Archive-http: /debian/
-Archive-rsync: debian/
-Archive-upstream: carroll.aset.psu.edu
-Security-ftp: /debian-security/
-Security-http: /debian-security/
-Security-rsync: debian-security/
+X-Archive-rsync: debian/
+Archive-upstream: ftp.cn.debian.org
+X-Security-ftp: /debian-security/
+X-Security-http: /debian-security/
+X-Security-rsync: debian-security/
 Security-upstream: lobos.debian.org
 IPv6: no
 Updates: twice
 Maintainer: anheng <liushiwei@gmail.com>
 Country: CN China
-Location: www.anheng.com
-Sponsor: anheng co.ltd http://www.anheng.com.cn
-Comment: 100Mbps
+Location: Beijing CNC
+Sponsor: anheng co.ltd http://www.anheng.com.cn/
+Bandwidth: 100Mbps
 
 Site: ftp.daum.net
 Type: leaf
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-ftp: /debian/
 Archive-http: /debian/
 IPv6: no
@@ -5888,11 +5938,11 @@
 Country: KR Korea
 Location: Seoul, Korea
 Sponsor: Daum Communications Corp. http://www.daum.net/
-Comment: 1Gbps
+Bandwidth: 1Gbps
 
 Site: mirror.rit.edu
 Type: leaf
-Archive-architecture: alpha amd64 arm armel i386 kfreebsd-amd64 kfreebsd-i386 powerpc sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-ftp: /debian/
 Archive-http: /debian/
 Archive-rsync: debian/
@@ -5907,11 +5957,12 @@
 Country: US United States
 Location: Rochester, NY
 Sponsor: Rochester Institute of Technology, RITLUG http://www.ritlug.org
-Comment: connected to the academic backbone and will soon be on ipv6/I2. 200Mbps
+Comment: connected to the academic backbone and will soon be on ipv6/I2.
+Bandwidth: 200Mbps
 
 Site: debian.corenetworks.net
 Type: leaf
-Archive-architecture: amd64 i386
+Archive-architecture: amd64 armhf i386 s390x
 Archive-http: /debian/
 IPv6: no
 Archive-upstream: ftp.egr.msu.edu
@@ -5919,7 +5970,7 @@
 Maintainer: Russell <russell@corenetworks.net>
 Country: US United States
 Sponsor: CoreNetworks Dedicated Servers http://corenetworks.net
-Comment: 1Gbps
+Bandwidth: 1Gbps
 
 Site: debian.comu.edu.tr
 Type: leaf
@@ -5928,40 +5979,46 @@
 Archive-http: /debian/
 Archive-upstream: ftp.de.debian.org
 CDImage-architecture: amd64 i386
-CDImage-ftp: /debian-cd/
+X-CDImage-ftp: /debian-cd/
 CDImage-upstream: ftp.de.debian.org
 IPv6: no
 Updates: once
 Maintainer: nyucel@comu.edu.tr, mirror@comu.edu.tr
 Country: TR Turkey
 Location: Canakkale
-Comment: 30Mbps
+Bandwidth: 30Mbps
 
 Site: ftp2.debian.org.ua
-Alias: mirror.3logic.net
 Type: Push-Secondary
-Archive-architecture: amd64 i386 kfreebsd-amd64 kfreebsd-i386
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-ftp: /debian/
 Archive-http: /debian/
 Archive-rsync: debian/
+Archive-upstream: ftp.ua.debian.org
+Archive-method: push
+Backports-ftp: /debian-backports/
+Backports-http: /debian-backports/
+Backports-rsync: debian-backports/
+Backports-upstream: ftp.de.debian.org
+Backports-method: push
 CDImage-ftp: /debian-cd/
 CDImage-http: /debian-cd/
 CDImage-rsync: debian-cd/
-Old-ftp: /debian-archive/
-Old-http: /debian-archive/
-Old-rsync: debian-archive/
+CDImage-upstream: ftp.ua.debian.org
+Volatile-ftp: /debian-volatile/
+Volatile-http: /debian-volatile/
+Volatile-rsync: debian-volatile/
+Volatile-upstream: ftp.ua.debian.org
 Security-ftp: /debian-security/
 Security-http: /debian-security/
 Security-rsync: debian-security/
 IPv6: no
-Archive-upstream: debian.org.ua
-Security-upstream: debian.org.ua
-CDImage-upstream: debian.org.ua
 Updates: push
-Maintainer: Oleg Milaenko <omnix@debian.org.ua>
+Maintainer: Oleg Milaenko <team@debian.org.ua>, omnix@debian.org.ua
 Country: UA Ukraine
-Location: Kiev, UA
-Comments: 100Mbps in Ukraine (UA-IX http://ua-ix.net.ua/eng.phtml), 2Mbps other
+Location: Kiev
+Sponsor: ColoCALL http://www.colocall.net/
+Bandwidth: 100Mbps in Ukraine (UA-IX http://ua-ix.net.ua/eng.phtml), 8Mbps other
 
 Site: debian.snet.uz
 Type: leaf
@@ -5977,13 +6034,13 @@
 Country: UZ Uzbekistan
 Location: Tashkent, Uzbekistan
 Sponsor: Sarkor Telecom http://www.sarkor.com
-Comments: 100Mbps in Uzbekistan (TAS-IX)
+Bandwidth: 100Mbps in Uzbekistan (TAS-IX)
 
 Site: mirror.its.uidaho.edu
 Type: leaf
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
-Archive-ftp: /debian/
-Archive-http: /pub/debian/
+Archive-architecture: amd64 armel hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+X-Archive-ftp: /debian/
+X-Archive-http: /pub/debian/
 IPv6: no
 Archive-upstream: debian.osuosl.org
 Updates: twice
@@ -5991,12 +6048,12 @@
 Country: US United States
 Location: Moscow, ID
 Sponsor: University of Idaho http://www.uidaho.edu
-Comments: 100Mbps for commercial routes, 1Gbps for Internet2 and NLR (National Lambda Rail)
+Bandwidth: 100Mbps for commercial routes, 1Gbps for Internet2 and NLR (National Lambda Rail)
 
 Site: ftp.cvut.cz
 Alias: ftp.fs.cvut.cz
 Type: leaf
-Archive-architecture: amd64 i386 ia64 kfreebsd-amd64 kfreebsd-i386
+Archive-architecture: amd64 armhf i386 ia64 kfreebsd-amd64 kfreebsd-i386 s390x
 Archive-ftp: /debian/
 Archive-http: /debian/
 Security-ftp: /debian-security/
@@ -6008,13 +6065,13 @@
 Maintainer: NetOps <net@fsid.cvut.cz>
 Country: CZ Czech Republic
 Location: Prague
-Sponsor: Czech Technical University  http://www.cvut.cz/
-Comments:  1Gbps to academic backbone
+Sponsor: Czech Technical University http://www.cvut.cz/
+Bandwidth: 1Gbps to academic backbone
 
 Site: debian.stream.uz
 Alias: debian.uz
 Type: leaf
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-ftp: /debian/
 Archive-http: /debian/
 IPv6: no
@@ -6023,12 +6080,12 @@
 Country: UZ Uzbekistan
 Location: 39-41, Zarqaynar str., Tashkent
 Sponsor: Sharq Telekom http://www.st.uz/
-Comments: 30Mbps
+Bandwidth: 30Mbps
 
 Site: ftp2.de.debian.org
-Includes: ftp.halifax.rwth-aachen.de 
+Includes: ftp.halifax.rwth-aachen.de
 Type: Push-Primary
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-ftp: /debian/
 Archive-http: /debian/
 Archive-rsync: debian/
@@ -6038,7 +6095,7 @@
 
 Site: ftp.halifax.rwth-aachen.de
 Type: Push-Primary
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-ftp: /debian/
 Archive-http: /debian/
 Archive-rsync: debian/
@@ -6047,7 +6104,7 @@
 Backports-ftp: /debian-backports/
 Backports-http: /debian-backports/
 Backports-rsync: debian-backports/
-Backports-upstream: syncproxy3.eu.debian.org 
+Backports-upstream: syncproxy3.eu.debian.org
 Backports-method: push
 CDImage-ftp: /debian-cd/
 CDImage-http: /debian-cd/
@@ -6064,7 +6121,7 @@
 Country: DE Germany
 Location: Aachen, Germany
 Sponsor: RWTH Aachen University http://www.rwth-aachen.de/
-Comment: 10Gbps
+Bandwidth: 10Gbps
 
 Site: ftp.debian.chuvsu.ru
 Alias: debian.chuvsu.ru
@@ -6085,7 +6142,7 @@
 
 Site: mirror.sim.ul.pt
 Type: leaf
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-ftp: /debian/
 Archive-http: /debian/
 Archive-rsync: /debian/
@@ -6099,15 +6156,15 @@
 Country: PT Portugal
 Location: Lisboa
 Sponsor: University of Lisboa - SIM center http://sim.fc.ul.pt/en/
-Comment: Gigabit connection
+Bandwidth: 1Gbps
 IPv6: no
 
 Site: ftp.seclan.com
 Type: leaf
-Archive-architecture: amd64 i386 powerpc
+Archive-architecture: amd64 armhf i386 s390x
 Archive-ftp: /debian/
 Archive-http: /debian/
-CDImage-ftp: /debian-cd/
+X-CDImage-ftp: /debian-cd/
 CDImage-http: /debian-cd/
 IPv6: no
 Archive-upstream: ftp.se.debian.org
@@ -6120,14 +6177,14 @@
 Site: debian.ignum.cz
 Alias: ucho.ignum.cz
 Type: leaf
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-ftp: /debian/
 Archive-http: /debian/
 Archive-rsync: debian/
 CDImage-ftp: /debian-cd/
 CDImage-http: /debian-cd/
 CDImage-rsync: debian-cd/
-IPv6: no
+IPv6: yes
 Archive-upstream: ftp.cz.debian.org
 CDImage-upstream: ftp.cz.debian.org
 Updates: twice
@@ -6139,7 +6196,7 @@
 
 Site: ftp.metu.edu.tr
 Type: leaf
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-ftp: /debian/
 Archive-http: /debian/
 Archive-rsync: debian/
@@ -6154,11 +6211,11 @@
 Country: TR Turkey
 Location: Ankara - TURKEY
 Sponsor: Middle East Technical University http://www.metu.edu.tr/
-Comment: 300Mbps. Connected to GEANT
+Bandwidth: 300Mbps. Connected to GEANT
 
 Site: repository.linux.pf
 Type: leaf
-Archive-architecture: amd64 i386 kfreebsd-amd64 kfreebsd-i386
+Archive-architecture: amd64 armhf hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 powerpc s390x
 Archive-ftp: /debian/
 Archive-http: /debian/
 Archive-rsync: debian/
@@ -6170,11 +6227,11 @@
 Location: Polynésie française
 Sponsor: LoLiTa http://www.lolita.pf/
 Sponsor: Mana (local ISP) http://www.mana.pf/
-Comment: 100Mbps.
+Bandwidth: 100Mbps
 
 Site: debian.cs.binghamton.edu
 Type: leaf
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-ftp: /debian/
 Archive-http: /debian/
 Archive-rsync: debian/
@@ -6189,36 +6246,48 @@
 Country: US United States
 Location: Binghamton, New York, USA
 Sponsor: Binghamton University Computer Science Department http://www.cs.binghamton.edu/
-Comments: 350Mbps
+Bandwidth: 350Mbps
 
 Site: ftp.nc.debian.org
-Alias: debian.nautile.nc
+Includes: debian.nautile.nc
+Type: Push-Secondary
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
+Archive-ftp: /debian/
+Archive-http: /debian/
+Archive-rsync: debian/
+Archive-upstream: ftp.au.debian.org
+IPv6: yes
+Updates: push
+Country: NC New Caledonia
+
+Site: debian.nautile.nc
 Type: Push-Secondary
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-ftp: /debian/
 Archive-http: /debian/
 Archive-rsync: debian/
 Archive-upstream: ftp.au.debian.org
+Archive-method: push
 Backports-ftp: /debian-backports/
 Backports-http: /debian-backports/
 Backports-rsync: debian-backports/
 Backports-upstream: syncproxy3.eu.debian.org
 Backports-method: push
-Security-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Security-architecture: amd64 armel hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
 Security-ftp: /debian-security/
 Security-http: /debian-security/
 Security-rsync: debian-security/
 Security-upstream: security.debian.org
 CDImage-ftp: /debian-cd/
 CDImage-http: /debian-cd/
-CDImage-rsync: debian-cd/
+X-CDImage-rsync: debian-cd/
 CDImage-upstream: cdimage.debian.org
 Volatile-ftp: /debian-volatile/
 Volatile-http: /debian-volatile/
 Volatile-rsync: debian-volatile/
 Volatile-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
 Volatile-upstream: volatile-master.debian.org
-IPv6: no
+IPv6: yes
 Updates: push
 Maintainer: Nicolas Aupetit <contact@nautile.nc>
 Country: NC New Caledonia
@@ -6226,20 +6295,9 @@
 Sponsor: Nautile (ISP) http://www.nautile.nc/
 X-Comment: generates ISOs localy using jigdo
 
-Site: www.debian.nautile.nc
-Type: Push-Primary
-WWW-http: /
-WWW-upstream: www-master.debian.org
-IPv6: no
-Updates: push
-Maintainer: Nicolas Aupetit <contact@nautile.nc>
-Country: NC New Caledonia
-Location: Noumea, New Caledonia
-Sponsor: Nautile (ISP) http://www.nautile.nc/
-
 Site: debian.lagis.at
 Type: Push-Secondary
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-ftp: /debian/
 Archive-http: /debian/
 Archive-upstream: ftp.at.debian.org
@@ -6258,17 +6316,28 @@
 Country: AT Austria
 Location: Linz
 Sponsor: lagis Internet Serviceprovider GmbH http://www.lagis.at/
-Comment: 200 Mbps
+Bandwidth: 200 Mbps
 
 Site: ftp.ba.debian.org
-Alias: mirror.debian.com.ba
+Includes: mirror.debian.com.ba
 Type: Push-Primary
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-ftp: /debian/
 Archive-http: /debian/
 Archive-rsync: debian/
-IPv6: no
+Archive-method: push
+Archive-upstream: syncproxy.eu.debian.org
+Country: BA Bosnia & Herzegovina
+
+Site: mirror.debian.com.ba
+Type: Push-Primary
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
+Archive-ftp: /debian/
+Archive-http: /debian/
+Archive-rsync: debian/
+Archive-method: push
 Archive-upstream: syncproxy.eu.debian.org
+IPv6: no
 Updates: push
 Maintainer: Avdija Ahmedhodzic <avdijaa@yahoo.com>, Avdija Ahmedhodzic <avdija@link.ba>
 Country: BA Bosnia & Herzegovina
@@ -6277,24 +6346,25 @@
 
 Site: mirror.sov.uk.goscomb.net
 Type: leaf
-X-Archive-architecture: amd64 i386
-X-Archive-ftp: /debian/
-X-Archive-http: /debian/
-X-CDImage-ftp: /debian-cd/
-X-CDImage-http: /debian-cd/
+Archive-architecture: amd64 armhf i386 s390x
+Archive-ftp: /debian/
+Archive-http: /debian/
+CDImage-ftp: /debian-cd/
+CDImage-http: /debian-cd/
 IPv6: yes
 Archive-upstream: ftp.uk.debian.org
 CDImage-upstream: ftp.uk.debian.org
 Updates: twice
 Maintainer: Goscomb Technologies Limited <mirrors@goscomb.net>
-Country: GB Great Britain
+Country: GB United Kingdom
 Location: London, E14
 Sponsor: Goscomb Technologies Limited http://www.goscomb.net
 Comment: Site is on a 1Gbps port (currently limited to 200Mbps) in one of our core PoPs close to peering exchanges.
+Bandwidth: 200Mbps
 
 Site: mirror.unej.ac.id
 Type: Push-Secondary
-X-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+X-Archive-architecture: amd64 armel hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
 X-Archive-ftp: /debian/
 X-Archive-http: /debian/
 X-Archive-rsync: debian/
@@ -6302,11 +6372,11 @@
 X-CDImage-http: /debian-cd/
 X-CDImage-rsync: debian-cd/
 X-CDImage-upstream: ftp.tw.debian.org
-X-Security-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+X-Security-architecture: amd64 armel hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
 X-Security-ftp: /debian-security/
 X-Security-http: /debian-security/
 X-Security-rsync: debian-security/
-X-Volatile-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
+X-Volatile-architecture: amd64 armel hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc
 X-Volatile-ftp: /debian-volatile/
 X-Volatile-http: /debian-volatile/
 X-Volatile-rsync: debian-volatile/
@@ -6323,9 +6393,19 @@
 X-Comment: disabled, no admin at the moment: <AANLkTi=H0K1-fcqxveFVC3RGy6a5nq6QebBzmfzbJdHp@mail.gmail.com>
 
 Site: ftp.cl.debian.org
-Alias: debian.netlinux.cl
-Type: leaf
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Includes: debian.netlinux.cl
+Type: Push-Primary
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
+Archive-ftp: /debian/
+Archive-http: /debian/
+Archive-rsync: debian/
+Archive-upstream: syncproxy.wna.debian.org
+IPv6: no
+Country: CL Chile
+
+Site: debian.netlinux.cl
+Type: Push-Primary
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-ftp: /debian/
 Archive-http: /debian/
 Archive-rsync: debian/
@@ -6336,7 +6416,7 @@
 Volatile-http: /debian-volatile/
 Volatile-rsync: debian-volatile/
 IPv6: no
-Archive-upstream: ftp.cl.debian.org
+Archive-upstream: syncproxy.wna.debian.org
 Security-upstream: security.debian.org
 Volatile-upstream: volatile.debian.org
 Updates: twice
@@ -6344,12 +6424,12 @@
 Country: CL Chile
 Location: Santiago de Chile
 Sponsor: Netlinux http://www.netlinux.cl
-Comment: 1Gbps bandwidth
+Bandwidth: 1Gbps
 
 Site: mirror.hmc.edu
 Alias: worblehat.math.hmc.edu
 Type: Push-Secondary
-Archive-architecture: amd64 hppa i386 kfreebsd-amd64 kfreebsd-i386 powerpc
+Archive-architecture: amd64 armhf i386 kfreebsd-amd64 kfreebsd-i386 powerpc s390x
 Archive-http: /debian/
 IPv6: no
 Archive-upstream: debian.osuosl.org
@@ -6362,7 +6442,7 @@
 
 Site: debian.morphium.info
 Type: Push-Primary
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-ftp: /debian/
 Archive-http: /debian/
 Archive-rsync: debian/
@@ -6379,7 +6459,7 @@
 Volatile-ftp: /debian-volatile/
 Volatile-http: /debian-volatile/
 Volatile-rsync: debian-volatile/
-IPv6: no
+IPv6: yes
 Archive-upstream: kassia.debian.org
 Volatile-upstream: kassia.debian.org
 Maintainer: Theodor Reppe <debian@morphium.info>
@@ -6389,7 +6469,7 @@
 
 Site: debian.mirror.dkm.cz
 Type: Push-Secondary
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-ftp: /debian/
 Archive-http: /debian/
 Archive-rsync: debian/
@@ -6399,7 +6479,7 @@
 Security-ftp: /debian-security/
 Security-http: /debian-security/
 Security-rsync: debian-security/
-IPv6: no
+IPv6: yes
 Archive-upstream: syncproxy.eu.debian.org
 Security-upstream: security.debian.org
 CDImage-upstream: cdimage.debian.org
@@ -6409,29 +6489,31 @@
 Location: Prague
 Sponsor: UPC http://www.upc.cz/
 Comment: mirror hw: Xeon 3220, 8GB RAM, 11xWD4000YR RAID5, 2x1Gbit link to our backbone router.
+Bandwidth: 2Gb
 
-Site: mirrors.hosef.org
+Site: mirror.ancl.hawaii.edu
 Type: Push-Secondary
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
-Archive-ftp: /debian/
-Archive-http: /debian/
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
+Archive-ftp: /linux/debian/
+Archive-http: /linux/debian/
 Archive-rsync: debian/
 Archive-upstream: debian.osuosl.org
-CDImage-ftp: /debian-cdimage/
-CDImage-http: /debian-cdimage/
-CDImage-rsync: debian-cdimage/
+CDImage-ftp: /linux/debian-cd/
+CDImage-http: /linux/debian-cd/
+CDImage-rsync: debian-cd/
 CDImage-upstream: debian.osuosl.org
 IPv6: no
 Updates: push
-Maintainer: R. Scott Belford <scott@hosef.org>
+Maintainer: Kevin McCarthy <me@kevinmccarthy.org>
 Country: US United States
-Location: University of Hawaii
+Location: Honolulu, HI, University of Hawaii
 Sponsor: School of Ocean and Earth Science and Technology http://www.soest.hawaii.edu/
-Comment: Internet2, 100Mbps
+Comment: Internet2
+Bandwidth: 100Mbps
 
 Site: mirror.neolabs.kz
 Type: leaf
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-ftp: /debian/
 Archive-http: /debian/
 Archive-rsync: debian/
@@ -6443,30 +6525,14 @@
 Sponsor: Neolabs LLP http://neolabs.kz/
 Comment: 300Mbps to Kazakhstan, 100Mbps to world
 
-Site: ftp.tcc.edu.tw
+Site: debian.mirror.cambrium.nl
 Type: leaf
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
-Archive-ftp: /debian/
-Archive-http: /debian/
-CDImage-ftp: /debian-cd/
-CDImage-http: /debian-cd/
-IPv6: no
-Archive-upstream: ftp.tw.debian.org
-CDImage-upstream: ftp.tw.debian.org
-Updates: twice
-Maintainer: tccftpadmin <rrayibm@gmail.com>
-Country: TW Taiwan
-Location: TaiChung County
-Comment: 1Gbps
-
-Site: debian.mirror.cambrium.nl
-Type: leaf
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-ftp: /debian/
 Archive-http: /debian/
 Archive-rsync: debian/
 Archive-upstream: ftp.nl.debian.org
-CDImage-ftp: /debian-cd/
+X-CDImage-ftp: /debian-cd/
 CDImage-http: /debian-cd/
 CDImage-rsync: debian-cd/
 CDImage-upstream: ftp.nl.debian.org
@@ -6488,15 +6554,15 @@
 Country: NL Netherlands
 Location: Amsterdam
 Sponsor: Cambrium http://www.cambrium.nl/
-Comment: 1Gbps
+Bandwidth: 1Gbps
 
 Site: debian.superhosting.cz
 Type: leaf
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-ftp: /debian/
 Archive-http: /debian/
-CDImage-ftp: /debian-cd/
-CDImage-http: /debian-cd/
+X-CDImage-ftp: /debian-cd/
+X-CDImage-http: /debian-cd/
 Security-ftp: /debian-security/
 Security-http: /debian-security/
 IPv6: no
@@ -6506,11 +6572,11 @@
 Updates: twice
 Maintainer: Ondrej Zuffa <linux@superhosting.cz>
 Country: CZ Czech Republic
-Comment: 100Mbps
+Bandwidth: 100Mbps
 
 Site: debian.md
 Type: Push-Secondary
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 powerpc
 Archive-ftp: /debian/
 Archive-http: /debian/
 Archive-rsync: debian/
@@ -6542,39 +6608,42 @@
 Country: MN Mongolia
 Location: STIT, Ulaanbaatar
 Sponsor: debian.mn team http://www.debian.mn/
-Comment: 2Mbps
+Bandwidth: 2Mbps
 
 Site: mirror.waia.asn.au
 Type: Push-Secondary
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-ftp: /debian/
 Archive-http: /debian/
 Archive-rsync: debian/
-IPv6: no
+CDImage-ftp: /pub/linux/debian-cd/
+CDImage-http: /pub/linux/debian-cd/
+IPv6: yes
 Archive-upstream: ftp.au.debian.org
 Updates: push
 Maintainer: Daniel Grimwood <reaper@ivec.org>
 Country: AU Australia
 Location: Perth, Western Australia
 Sponsor: Western Australian Internet Association http://www.waia.asn.au/
-Comments: 1Gps peering in Western Australia
+Bandwidth: 1Gps peering in Western Australia
 
 Site: mirror2.corbina.ru
 Type: leaf
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-ftp: /debian/
 Archive-http: /debian/
 IPv6: no
 Archive-upstream: ftp.ru.debian.org
 Updates: once
-Maintainer: mirror2.corbina.ru <bogdanov_r@corbina.ru>, mirrors@corbina.net, sh.vadim@corbina.ru
+Maintainer: mirror2.corbina.ru <bogdanov_r@corbina.ru>, mirrors@corbina.net
+Comment: bogdanov_r bounces
 Country: RU Russia
 Location: MSK Corbina Telecom
 Sponsor: Corbina Telecom http://home.corbina.ru/
 
 Site: mirror.cse.iitk.ac.in
 Type: leaf
-Archive-architecture: amd64 i386
+Archive-architecture: amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 s390x
 Archive-ftp: /debian/
 Archive-http: /debian/
 Archive-upstream: hanzubon.jp
@@ -6584,15 +6653,15 @@
 Country: IN India
 Location: IIT Kanpur, Kanpur -208016, India
 Sponsor: CSE Department, IIT Kanpur http://www.cse.iitk.ac.in/
-Comments: 1Gbps
+Bandwidth: 1Gbps
 
 Site: mirror.intrapower.net.au
 Alias: mirror1.intrapower.net.au
 Alias: mirror2.intrapower.net.au
 Type: leaf
 CDImage-architecture: amd64 i386 sparc
-CDImage-ftp: /debian-cd/
-CDImage-http: /debian-cd/
+X-CDImage-ftp: /debian-cd/
+X-CDImage-http: /debian-cd/
 CDImage-rsync: debian-cd/
 IPv6: no
 CDImage-upstream: cdimage.debian.org
@@ -6600,26 +6669,30 @@
 Maintainer: James Paussa <mirror@intrapower.net.au>
 Country: AU Australia
 Sponsor: IntraPower http://www.intrapower.com.au/
-Comments: 200Mbps
+Bandwidth: 200Mbps
 
 Site: mirrors.ucr.ac.cr
 Alias: espejos.ucr.ac.cr
 Type: leaf
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-ftp: /debian/
 Archive-http: /debian/
 Archive-rsync: debian/
+Backports-ftp: /debian-backports/
+Backports-http: /debian-backports/
+Backports-rsync: debian-backports/
 CDImage-ftp: /debian-cd/
 CDImage-http: /debian-cd/
 CDImage-rsync: debian-cd/
-Volatile-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
-Volatile-ftp: /debian-volatile/
-Volatile-http: /debian-volatile/
-Volatile-rsync: debian-volatile/
+X-Volatile-architecture: amd64 armel hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+X-Volatile-ftp: /debian-volatile/
+X-Volatile-http: /debian-volatile/
+X-Volatile-rsync: debian-volatile/
 IPv6: no
 Archive-upstream: ftp.ca.debian.org
 Volatile-upstream: ftp.de.debian.org
 CDImage-upstream: ftp.de.debian.org
+Backports-upstream: mirror.salud.gob.sv
 Updates: once
 Maintainer: Mario Guerra <mario.guerra@ucr.ac.cr>
 Country: CR Costa Rica
@@ -6628,7 +6701,7 @@
 
 Site: debian.ipacct.com
 Type: leaf
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-ftp: /debian/
 Archive-http: /debian/
 Archive-rsync: debian/
@@ -6647,11 +6720,12 @@
 Maintainer: Boian Bonev <bbonev@ipacct.com>
 Country: BG Bulgaria
 Location: Sofia, Bulgaria
-Comment: bandwidth limited, 1Gbps in Bulgaria
+Comment: bandwidth limited
+Bandwidth: 1Gbps in Bulgaria
 
 Site: ftp.tku.edu.tw
 Type: Push-Secondary
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-ftp: /debian/
 Archive-http: /debian/
 CDImage-ftp: /debian-cd/
@@ -6662,11 +6736,11 @@
 Updates: push
 Maintainer: wisely <wisely@mail.tku.edu.tw>
 Country: TW Taiwan
-Comment: 1Gbps
+Bandwidth: 1Gbps
 
 Site: mirror.transact.net.au
 Type: leaf
-Archive-architecture: amd64 i386
+Archive-architecture: amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 s390x
 Archive-ftp: /debian/
 Archive-http: /debian/
 IPv6: no
@@ -6691,11 +6765,11 @@
 Country: US United States
 Location: Missoula, Montana
 Sponsor: Modwest http://modwest.com
-Comment: 100mbps
+Bandwidth: 100mbps
 
 Site: debian.mirror.root.lu
 Type: leaf
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-ftp: /debian/
 Archive-http: /debian/
 Archive-rsync: debian/
@@ -6709,11 +6783,11 @@
 Country: LU Luxembourg
 Location: Steinsel
 Sponsor: root S.A. http://www.root.lu/
-Comment: 1Gbps
+Bandwidth: 1Gbps
 
 Site: debian.advalem.net
 Type: Push-Secondary
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-ftp: /debian/
 Archive-http: /debian/
 Archive-rsync: debian/
@@ -6724,8 +6798,8 @@
 Backports-rsync: debian-backports/
 Backports-method: push
 Backports-upstream: syncproxy3.eu.debian.org
-CDImage-ftp: /debian-cd/
-CDImage-http: /debian-cd/
+X-CDImage-ftp: /debian-cd/
+X-CDImage-http: /debian-cd/
 CDImage-rsync: debian-cd/
 CDImage-upstream: cdimage.debian.org
 Old-ftp: /debian-archive/
@@ -6748,11 +6822,12 @@
 Country: FR France
 Location: Paris, Ile de France
 Sponsor: Advalem Technologies Media Broadcast Center http://www.advalem.fr/
-Comment: 1Gbps, Jigdo used for ISO
+Comment: Jigdo used for ISO
+Bandwidth: 1Gbps
 
 Site: mirrors.bloomu.edu
 Type: leaf
-Archive-architecture: amd64 i386 kfreebsd-amd64 kfreebsd-i386
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 powerpc s390x
 Archive-ftp: /debian/
 Archive-http: /debian/
 Archive-rsync: debian/
@@ -6771,12 +6846,13 @@
 Country: US United States
 Location: Bloomsburg, PA
 Comment: Internet - 40 Mbps, I2 - 10Mbps, LAN - 1Gbps
+Bandwidth: 40Mbps
 
 Site: debian.usu.edu
 Alias: mirror.usu.edu
 Alias: mirrors.usu.edu
 Type: leaf
-Archive-architecture: amd64 armel i386 powerpc sparc
+Archive-architecture: amd64 armel armhf i386 powerpc s390x sparc
 Archive-http: /debian/
 IPv6: no
 Archive-upstream: rsync.osuosl.org
@@ -6789,19 +6865,19 @@
 
 Site: ftp.uoi.gr
 Type: leaf
-Archive-architecture: amd64 hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 powerpc
-Archive-ftp: /debian/
-Archive-http: /debian/
+Archive-architecture: amd64 armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 powerpc s390x
+X-Archive-ftp: /debian/
+X-Archive-http: /debian/
 IPv6: no
 Archive-upstream: ftp.gr.debian.org
 Updates: twice
 Maintainer: University Of Ioannina <ftp@uoi.gr>
 Country: GR Greece
-Comment: 1Gbps
+Bandwidth: 1Gbps
 
 Site: debian.linux.edu.lv
 Type: Push-Secondary
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-ftp: /debian/
 Archive-http: /debian/
 Archive-rsync: debian/
@@ -6814,7 +6890,7 @@
 Maintainer: Leo Truksans <leot@linux.edu.lv>
 Country: LV Latvia
 Location: University of Latvia
-Comment: 1Gbps to Latvian ISPs, 1,25Gb/s to other countries via GEANT
+Bandwidth: 1Gbps to Latvian ISPs, 1,25Gb/s to other countries via GEANT
 
 Site: mirror.yellowfiber.net
 Type: leaf
@@ -6822,27 +6898,28 @@
 CDImage-upstream: mirror.rit.edu
 Maintainer: Ross <lists@skafari.com>, support@yellowfiber.net
 Country: US United States
-Comment: 1Gbps
+IPv6: no
+Bandwidth: 1Gbps
 
-Site: debs.ifsul.edu.br
+Site: debs.pelotas.ifsul.edu.br
 Type: Push-Secondary
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-http: /debian/
 Archive-ftp: /debian/
 Archive-upstream: ftp.br.debian.org
-CDImage-http: /debian/
-CDImage-ftp: /debian/
+CDImage-http: /debian-cd/
+X-CDImage-ftp: /debian-cd/
 CDImage-upstream: ftp.br.debian.org
 IPv6: no
-Maintainer: Instituto Federal Sul-rio-grandense <cmr@ifsul.edu.br>
+Maintainer: CMR - Instituto Federal Sul-rio-grandense - Campus Pelotas <cmr@pelotas.ifsul.edu.br>
 Country: BR Brazil
 Location: Pelotas-RS
-Sponsor: Instituto Federal Sul-rio-grandense http://www.ifsul.edu.br/
-Comment: 15Mbps
+Sponsor: Instituto Federal Sul-rio-grandense http://www.pelotas.ifsul.edu.br/
+Bandwidth: 34Mbps
 
 Site: debian.bononia.it
 Type: leaf
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf i386 powerpc s390x
 Archive-ftp: /debian/
 Archive-http: /debian/
 Archive-rsync: debian/
@@ -6852,11 +6929,11 @@
 Country: IT Italy
 Location: Bologna, Emilia Romagna
 Sponsor: Associazione Bononia.it http://www.bononia.it/
-Comment: 8Mbps
+Bandwidth: 8Mbps
 
 Site: mirror.its.dal.ca
 Type: Push-Secondary
-Archive-architecture: alpha amd64 arm armel hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-ftp: /debian/
 Archive-http: /debian/
 Archive-rsync: debian/
@@ -6871,6 +6948,7 @@
 Location: Halifax Nova Scotia
 Sponsor: Dalhousie University http://dal.ca/
 Comment: 1Gb/s CANet / I2 Peers, 300Mb/s shared commodity QoS'd low priority on commodity link
+Bandwidth: 300 Mb/s
 
 Site: mirrors.melbourne.co.uk
 Type: Push-Secondary
@@ -6880,15 +6958,15 @@
 IPv6: no
 Archive-upstream: ftp.uk.debian.org
 Maintainer: Chris Merrett <support.team@melbourne.co.uk>
-Country: GB Great Britain
+Country: GB United Kingdom
 Location: Manchester
 Sponsor: Melbourne Server Hosting Ltd. http://www.melbourne.co.uk/
-Comment: 1Gbps
+Bandwidth: 1Gbps
 
 Site: ftp.ec-m.fr
 Alias: ftp.centrale-marseille.fr
 Type: Push-Secondary
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-ftp: /debian/
 Archive-http: /debian/
 IPv6: yes
@@ -6902,11 +6980,12 @@
 
 Site: mirror.bytemark.co.uk
 Type: Push-Secondary
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-ftp: /debian/
 Archive-http: /debian/
 Archive-rsync: debian/
 Archive-upstream: ftp.uk.debian.org
+Archive-method: push
 Backports-ftp: /debian-backports/
 Backports-http: /debian-backports/
 Backports-rsync: debian-backports/
@@ -6919,30 +6998,30 @@
 IPv6: yes
 Updates: twice
 Maintainer: Patrick Cherry <support@support.bytemark.co.uk>
-Country: GB Great Britain
+Country: GB United Kingdom
 Location: Manchester, UK
 Sponsor: Bytemark Hosting http://www.bytemark.co.uk
-Comment: 1Gbps
+Bandwidth: 1Gbps
 
 Site: mirror.unitedcolo.de
 Type: leaf
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-ftp: /debian/
 Archive-http: /debian/
 Archive-rsync: debian/
-IPv6: no
+IPv6: yes
 Archive-upstream: ftp.de.debian.org
 Updates: twice
 Maintainer: Nils Buechner <n.buechner@unitedcolo.de>
 Country: DE Germany
 Location: Coburg, Germany
 Sponsor: UNITED COLO GmbH http://www.ngz-server.de
-Comment: 2Gbps
+Bandwidth: 2Gbps
 
 Site: debian.securedservers.com
 Aliases: mirrors.securedservers.com
 Type: leaf
-Archive-architecture: amd64 i386
+Archive-architecture: amd64 armhf i386 s390x
 Archive-http: /debian/
 IPv6: no
 Archive-upstream: mirrors.kernel.org
@@ -6950,11 +7029,11 @@
 Country: US United States
 Location: Tempe, AZ
 Sponsor: Secured Servers, LLC http://www.securedservers.com/
-Comment: 80Mbps
+Bandwidth: 80Mbps
 
 Site: mirror.kku.ac.th
 Type: Push-Secondary
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-ftp: /debian/
 Archive-http: /debian/
 Archive-rsync: debian/
@@ -6969,7 +7048,7 @@
 Country: TH Thailand
 Location: Khon Kaen
 Sponsor: Computer Center, Khon Kaen University http://www.computer.kku.ac.th/
-Comment: 1Gbps
+Bandwidth: 1Gbps
 
 Site: debian.gnu.gen.tr
 Aliases: windu.bcc.bilkent.edu.tr
@@ -6987,20 +7066,20 @@
 Maintainer: Yavuz Selim Komur <komur@gnu.gen.tr>
 Country: TR Turkey
 Location: Bilkent University
-Comment: 100Mbps
+Bandwidth: 100Mbps
 
 Site: deb-mir1.naitways.net
 Type: Push-Secondary
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-http: /debian/
-IPv6: no
+IPv6: yes
 Archive-upstream: ftp2.fr.debian.org
 Updates: twice
 Maintainer: Jeremy SPY <contact@naitways.com>
 Country: FR France
 Location: Paris 19e
 Sponsor: Naitways http://www.naitways.com
-Comment: 60Mbps
+Bandwidth: 60Mbps
 
 Site: debian.cc.lehigh.edu
 Type: Push-Secondary
@@ -7016,39 +7095,37 @@
 Location: Bethlehem, PA (USA)
 Comment: 300Mbps, Internet2
 
-Site: backports.sipo.nl
-Maintainer: Martijn Grendelman <mirrors@sipo.nl>
-Backports-http: /
-Country: NL Netherlands
-Location: Hoofddorp
-Sponsor: Sipo.nl Webhosting, Eindhoven, The Netherlands, http://www.sipo.nl
-
 Site: mirror.buildd.net
+Type: Push-Secondary
 Backports-http: /debian-backports/
+Backports-rsync: debian-backports/
 Backports-upstream: syncproxy3.eu.debian.org
 Backports-method: push
 Location: Nuernberg
 Maintainer: Ingo Juergensmann <ij@buildd.net>
 Sponsor: Ingo Juergensmann http://www.buildd.net/
+IPv6: yes
 Country: DE Germany
-Comment: 100Mbps
+Bandwidth: 100Mbps
 
 Site: ftp.lecl.net
 Type: Push-Secondary
-Archive-architecture: amd64 i386 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-ftp: /debian/
 Archive-http: /debian/
 Archive-rsync: debian/
+Archive-method: push
 IPv6: no
 Archive-upstream: ftp.kr.debian.org
 Maintainer: Lee YeoSong <mirroradmin@lecl.net>
-Country: KR Korea (South)
+Country: KR Korea
+Location: Cheonahn, Korea
 Sponsor: Love-Angel Electronic-Computation Laboratory http://www.lecl.net/
-Comment: 100Mbps shared
+Bandwidth: 100Mbps shared
 
 Site: debian.usthb.dz
 Type: leaf
-Archive-architecture: i386
+Archive-architecture: amd64 i386
 Archive-ftp: /debian/
 Archive-http: /debian/
 Archive-rsync: debian/
@@ -7064,11 +7141,11 @@
 Maintainer: M.C BOUKALA <dcri@usthb.dz>
 Country: DZ Algeria
 Sponsor: Universite USTHB http://usthb.dz
-Comment: 34 Mbps
+Bandwidth: 34 Mbps
 
 Site: mirrors.xservers.ro
 Type: leaf
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-ftp: /debian/
 Archive-http: /debian/
 Archive-rsync: debian/
@@ -7084,21 +7161,10 @@
 Location: Bucharest
 Comment: Romania: 1 Gbps, International: 20 Mbps
 
-Site: debian.turkmesh.com.tr
-Type: Push-Secondary
-Archive-architecture: amd64 i386 ia64 kfreebsd-amd64 kfreebsd-i386
-Archive-http: /debian/
-IPv6: no
-Archive-upstream: ftp.tr.debian.org
-Maintainer: Levent YILDIRIM <levent.yildirim@turkmesh.com.tr>
-Country: TR Turkey
-Sponsor: TM Telekom http://www.turkmesh.com.tr/
-Comment: 100Mbps
-
 Site: ftp.lt.debian.org
 Includes: debian.mirror.vu.lt
 Type: Push-Secondary
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-ftp: /debian/
 Archive-http: /debian/
 Archive-rsync: debian/
@@ -7109,7 +7175,7 @@
 Site: debian.mirror.vu.lt
 Aliases: e450.vu.lt
 Type: Push-Secondary
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-ftp: /debian/
 Archive-http: /debian/
 Archive-rsync: debian/
@@ -7140,10 +7206,11 @@
  -Up to 240 Mbps to Lithuania networks;
  -Up to 10 Mbps to other worldwide networks;
  -Total Maximum outgoing bandwidth is 260 Mbps.
+Bandwidth: 240 Mbps
 
 Site: mirrors.ispros.com.bd
 Type: leaf
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-ftp: /debian/
 Archive-http: /debian/
 Archive-rsync: debian/
@@ -7153,11 +7220,11 @@
 Country: BD Bangladesh
 Location: Bangladesh
 Sponsor: IS Pros Limited http://www.ispros.com.bd/
-Comment: 100Mbps
+Bandwidth: 100Mbps
 
 Site: debian.simnet.is
-Type: leaf
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Type: Push-Secondary
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-ftp: /debian/
 Archive-http: /debian/
 Archive-rsync: debian/
@@ -7169,36 +7236,59 @@
 CDImage-upstream: ftp.se.debian.org
 IPv6: no
 Maintainer: Gudmundur Mar Kristjansson <mirrors@siminn.is>
+Sponsor: Simnet http://simnet.is/
 Country: IS Iceland
-Comment: 1Gbps
+Bandwidth: 1Gbps
 
-Site: mirror.eurid.eu
+Site: be.mirror.eurid.eu
 Type: leaf
-Archive-architecture: amd64 i386
+Archive-architecture: amd64 armhf i386 s390x
 Archive-ftp: /debian/
 Archive-http: /debian/
-Archive-upstream: ftp.nl.debian.org
+Archive-upstream: ftp.be.debian.org
 Backports-ftp: /debian-backports/
 Backports-http: /debian-backports/
-Backports-upstream: ftp.nl.debian.org
+Backports-upstream: ftp.de.debian.org
 CDImage-ftp: /debian-cd/
 CDImage-http: /debian-cd/
-CDImage-upstream: ftp.nl.debian.org
+CDImage-upstream: ftp-stud.hs-esslingen.de
 Volatile-architecture: amd64 i386
 Volatile-ftp: /debian-volatile/
 Volatile-http: /debian-volatile/
-Volatile-upstream: ftp.nl.debian.org
+Volatile-upstream: ftp.be.debian.org
 IPv6: no
 Maintainer: EURid Operations <tech@eurid.eu>
 Country: BE Belgium
 Location: Nossegem
 Sponsor: EURid vzw/asbl http://www.eurid.eu/
-Comment: 100mbit
+Bandwidth: 100mbit
+
+Site: nl.mirror.eurid.eu
+Type: leaf
+Archive-architecture: amd64 armhf i386 s390x
+Archive-ftp: /debian/
+Archive-http: /debian/
+Archive-upstream: be.mirror.eurid.eu
+Backports-ftp: /debian-backports/
+Backports-http: /debian-backports/
+Backports-upstream: be.mirror.eurid.eu
+CDImage-ftp: /debian-cd/
+CDImage-http: /debian-cd/
+CDImage-upstream: be.mirror.eurid.eu
+Volatile-architecture: amd64 i386
+Volatile-ftp: /debian-volatile/
+Volatile-http: /debian-volatile/
+Volatile-upstream: be.mirror.eurid.eu
+IPv6: no
+Maintainer: EURid Operations <tech@eurid.eu>
+Country: NL Netherlands
+Sponsor: EURid vzw/asbl http://www.eurid.eu/
+Bandwidth: 100mbit
 
 Site: mirror.1und1.de
 Aliases: mirror.eu.oneandone.net
-Type: leaf
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Type: Push-Secondary
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-ftp: /debian/
 Archive-http: /debian/
 Archive-rsync: debian/
@@ -7220,12 +7310,12 @@
 IPv6: yes
 Maintainer: 1 und 1 Internet AG <mirroradmin@1und1.de>
 Country: DE Germany
-Sponsor: 1&1 Internet AG http://www.1und1.de/
-Comment: 1Gbps
+Sponsor: 1&amp;1 Internet AG http://www.1und1.de/
+Bandwidth: 1Gbps
 
 Site: mirrors.rackhosting.com
 Type: leaf
-Archive-architecture: amd64 i386 ia64 kfreebsd-amd64 kfreebsd-i386 sparc 
+Archive-architecture: amd64 i386 ia64 kfreebsd-amd64 kfreebsd-i386 sparc
 Archive-ftp: /debian/
 Archive-http: /debian/
 Archive-rsync: debian/
@@ -7239,15 +7329,16 @@
 Archive-upstream: ftp.de.debian.org
 Volatile-upstream: ftp.de.debian.org
 CDImage-upstream: ftp.de.debian.org
-Maintainer: Tommy Eriksen <te@rackhosting.com>
+Maintainer: support@rackhosting.com
 Country: DK Denmark
 Location: Taastrup, Denmark
 Sponsor: Rackhosting.com http://rackhosting.com/
-Comment: 1Gbps
+Bandwidth: 1Gbps
+Comment: maintainer address bounces
 
 Site: debian.unal.edu.co
 Type: leaf
-Archive-architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
 Archive-ftp: /debian/
 Archive-http: /debian/
 Archive-rsync: debian/
@@ -7266,7 +7357,7 @@
 Country: CO Colombia
 Location: National University of Colombia
 Sponsor: Departament of Chemistry, Computer Center http://www.unal.edu.co/
-Comment: 300Mbps
+Bandwidth: 300Mbps
 
 Site: debian.au.mirrormax.net
 Type: leaf
@@ -7278,4 +7369,1183 @@
 Country: AU Australia
 Location: Sydney
 Sponsor: MirrorMax http://www.mirrormax.net/
-Comment: 100Mbps
+Bandwidth: 100Mbps
+
+Site: mirrors.ece.ubc.ca
+Aliases: xyzzy.ece.ubc.ca
+Type: Push-Secondary
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
+Archive-http: /debian/
+Archive-upstream: ravel.debian.org
+Archive-method: push
+Backports-http: /debian-backports/
+Backports-upstream: backports-master.debian.org
+Backports-method: push
+Volatile-http: /debian-volatile/
+Volatile-upstream: volatile-master.debian.org
+Volatile-method: push
+IPv6: no
+Maintainer: Chris Dumont <mirrors@ece.ubc.ca>
+Country: CA Canada
+Location: Vancouver
+Sponsor: UBC Electrical and Computer Engineering http://www.ece.ubc.ca/
+
+Site: mirror.ens-lyon.fr
+Type: leaf
+Archive-architecture: amd64 armel i386 ia64 powerpc sparc
+X-Archive-ftp: /debian/
+X-Archive-http: /debian/
+X-Archive-rsync: debian/
+X-Comment: not acked by admin
+Archive-upstream: ftp.fr.debian.org
+Country: FR France
+Location: Lyon
+Sponsor: ENS Lyon http://www.ens-lyon.fr/
+
+Site: shadow.ind.ntou.edu.tw
+Type: Push-Secondary
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
+Archive-ftp: /debian/
+Archive-http: /debian/
+Archive-rsync: debian/
+Archive-method: push
+Archive-upstream: ftp.tw.debian.org
+CDImage-ftp: /debian-cd/
+X-CDImage-http: /debian-cd/
+X-CDImage-rsync: debian-cd/
+CDImage-upstream: ftp.tw.debian.org
+IPv6: no
+Maintainer: Ming-Ting Yao Wei <mwei@lxde.org>
+Country: TW Taiwan
+Location: National Taiwan Ocean University
+Sponsor: Institute of Network Development http://ind.ntou.edu.tw/
+Bandwidth: 1Gbps
+
+Site: mirrors.163.com
+Type: Push-Secondary
+Archive-architecture: amd64 i386
+Archive-http: /debian/
+Archive-upstream: ftp.tw.debian.org
+Archive-method: push
+Backports-architecture: amd64 i386
+Backports-http: /debian-backports/
+Backports-upstream: ftp.tw.debian.org
+Backports-method: push
+CDImage-http: /debian-cd/
+X-CDImage-rsync: debian-cd/
+CDImage-upstream: ftp.se.debian.org
+IPv6: no
+Updates: once
+Maintainer: netease <mirror@service.netease.com>
+Country: CN China
+Sponsor: Netease http://www.163.com/
+Bandwidth: 1Gbps
+
+Site: mirror.datacenter.by
+Type: leaf
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
+Archive-ftp: /debian/
+Archive-http: /debian/
+Archive-rsync: debian/
+Backports-ftp: /debian-backports/
+Backports-http: /debian-backports/
+Backports-rsync: debian-backports/
+CDImage-ftp: /debian-cd/
+CDImage-http: /debian-cd/
+CDImage-rsync: debian-cd/
+Volatile-ftp: /debian-volatile/
+Volatile-http: /debian-volatile/
+Volatile-rsync: debian-volatile/
+IPv6: no
+Archive-upstream: ftp.by.debian.org
+Backports-upstream: ftp.by.debian.org
+Volatile-upstream: ftp.by.debian.org
+CDImage-upstream: ftp.by.debian.org
+Updates: push
+Maintainer: Mitry Matyushkov <ftp@mgts.by>
+Country: BY Belarus
+Bandwidth: 2Gbps
+
+Site: mirror.orion.rs
+Type: leaf
+Archive-architecture: amd64 armel hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+X-Archive-ftp: /debian/
+X-Archive-http: /debian/
+X-Archive-rsync: debian/
+IPv6: no
+Archive-upstream: ftp.de.debian.org
+Updates: twice
+Maintainer: Bogdan Culibrk <bogdan.culibrk@oriontelekom.rs>, hosting@oriontelekom.rs
+Country: RS Serbia
+Location: Belgrade
+Sponsor: Orion Telekom http://www.oriontelekom.rs/
+Bandwidth: 1Gbps
+
+Site: mirror.mycre.ws
+Type: Push-Secondary
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
+X-Archive-ftp: /debian/
+X-Archive-http: /debian/
+X-Archive-rsync: debian/
+Archive-method: push
+Archive-upstream: syncproxy.wna.debian.org
+X-Backports-ftp: /debian-backports/
+X-Backports-http: /debian-backports/
+X-Backports-rsync: debian-backports/
+Backports-method: push
+Backports-upstream: backports-master.debian.org
+IPv6: yes
+Updates: push
+Maintainer: Robert Edmonds <edmonds@debian.org>
+Country: US United States
+Location: Atlanta, GA, US
+Sponsor: Internet Systems Consortium, Inc. http://www.isc.org/
+Bandwidth: 1Gbps
+
+Site: debian.gtisc.gatech.edu
+Type: Push-Secondary
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
+Archive-ftp: /debian/
+Archive-http: /debian/
+Archive-rsync: debian/
+Archive-method: push
+Archive-upstream: syncproxy.wna.debian.org
+Backports-ftp: /debian-backports/
+Backports-http: /debian-backports/
+Backports-rsync: debian-backports/
+Backports-method: push
+Backports-upstream: backports-master.debian.org
+Old-ftp: /debian-archive/
+Old-http: /debian-archive/
+Old-rsync: debian-archive/
+Old-upstream: archive.debian.org
+IPv6: yes
+Updates: push
+Maintainer: Robert Edmonds <edmonds@debian.org>, Paul Royal <paul@gtisc.gatech.edu>, Adam Allred <aallred@cc.gatech.edu>
+Country: US United States
+Location: Atlanta, GA, US
+Sponsor: Georgia Tech Information Security Center (GTISC) http://gtisc.gatech.edu/
+Bandwidth: 1Gbps
+
+Site: ftp.uni-pannon.hu
+Aliases: ftp.vein.hu
+Type: leaf
+Archive-architecture: amd64 armhf i386 ia64 s390x
+Archive-ftp: /debian/
+Archive-http: /debian/
+IPv6: yes
+Archive-upstream: ftp.be.debian.org
+Maintainer: Laszlo Szabo <szablac@almos.uni-pannon.hu>
+Country: HU Hungary
+Location: Hungary/Veszprem
+Sponsor: University of Pannonia http://www.uni-pannon.hu
+Bandwidth: 100Mbps
+
+Site: debian.bjtu.edu.cn
+Alias: mirror.bjtu.edu.cn
+Aliases: mirror6.bjtu.edu.cn
+Aliases: ftp.bjtu.edu.cn
+Type: leaf
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
+Archive-http: /debian/
+Archive-ftp: /debian/
+Archive-rsync: debian/
+Archive-upstream: ftp.au.debian.org
+Archive-method: push
+IPv6: yes
+Maintainer: ideal <idealities@gmail.com>
+Country: CN China
+Location: Beijing Jiaotong University
+Sponsor: Beijing Jiaotong University http://www.bjtu.edu.cn/
+Bandwidth: 100Mbps
+
+Site: mirror.pregi.net
+Type: leaf
+Archive-architecture: amd64 i386
+Archive-ftp: /debian/
+Archive-http: /debian/
+Archive-upstream: ftp.jaist.ac.jp
+CDImage-architecture: amd64 armel hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+X-CDImage-ftp: /debian-cd/
+X-CDImage-http: /debian-cd/
+CDImage-upstream: ftp.jaist.ac.jp
+IPv6: yes
+Updates: twice
+Maintainer: PREGINET-OPS <rod@asti.dost.gov.ph>
+Country: PH Philippines
+Sponsor: PREGINET http://www.pregi.net/
+Bandwidth: 100Mbps
+
+Site: mirrors.accretive-networks.net
+Type: leaf
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
+Archive-http: /debian/
+IPv6: no
+Archive-upstream: mirrors.kernel.org
+Maintainer: Mirror Support <debaccretor@accretive-networks.net>
+Country: US United States
+Location: Seattle, WA
+Sponsor: Accretive Networks http://accretivetg.com/
+Bandwidth: 1Gbps
+
+Site: server.bdwservice.eu
+Type: leaf
+Archive-architecture: amd64
+X-Archive-ftp: /debian/
+X-Archive-http: /debian/
+X-Volatile-ftp: /debian-volatile/
+X-Volatile-http: /debian-volatile/
+X-Security-ftp: /debian-security/
+X-Security-http: /debian-security/
+IPv6: no
+Archive-upstream: ftp.de.debian.org
+Volatile-upstream: ftp.de.debian.org
+Updates: twice
+Maintainer: Andy Klemann <contralto@bdwmail.eu>
+Country: DE Germany
+Bandwidth: 50Mbps
+
+Site: ftp.cn.debian.org
+Includes: debian.ustc.edu.cn
+Type: Push-Secondary
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
+Archive-ftp: /debian/
+Archive-http: /debian/
+Archive-rsync: debian/
+Archive-method: push
+Archive-upstream: syncproxy.wna.debian.org
+Country: CN China
+
+Site: debian.ustc.edu.cn
+Aliases: mirrors.ustc.edu.cn
+Aliases: debian6.ustc.edu.cn
+Type: Push-Secondary
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
+Archive-ftp: /debian/
+Archive-http: /debian/
+Archive-rsync: debian/
+Archive-upstream: syncproxy.wna.debian.org
+Archive-method: push
+Backports-ftp: /debian-backports/
+Backports-http: /debian-backports/
+Backports-rsync: debian-backports/
+Backports-upstream: backports-master.debian.org
+Backports-method: push
+CDImage-ftp: /debian-cd/
+CDImage-http: /debian-cd/
+CDImage-rsync: debian-cd/
+CDImage-upstream: ftp2.de.debian.org
+Volatile-ftp: /debian-volatile/
+Volatile-http: /debian-volatile/
+Volatile-rsync: debian-volatile/
+Volatile-upstream: ftp.de.debian.org
+IPv6: yes
+Updates: twice
+Maintainer: Stephen Zhang <stephenpcg@gmail.com>, mirrors@ustc.edu.cn
+Country: CN China
+Location: Hefei
+Sponsor: USTC Network Information Center http://ustcnet.ustc.edu.cn/
+Sponsor: University of Science and Technology of China http://www.ustc.edu.cn/
+Bandwidth: 1Gbps
+
+Site: debian.mirror.tn
+Type: leaf
+Archive-architecture: amd64 armel i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Archive-http: /debian/
+IPv6: no
+Archive-upstream: ftp.de.debian.org
+Maintainer: Agence_Tunisienne_Internet <hebergement@ati.tn>
+Country: TN Tunisia
+Sponsor: Agence Tunisienne d'Internet http://www.ati.tn/
+Location: Tunis
+Bandwidth: 1Gbps
+
+Site: mg.debian.net
+Type: leaf
+Archive-architecture: amd64 i386
+Archive-ftp: /debian/
+Archive-http: /debian/
+IPv6: no
+Archive-upstream: ftp.fr.debian.org
+Updates: twice
+Maintainer: Thierry Randrianiriana <thierry@debian.org>
+Country: MG Madagascar
+Sponsor: Debian Malagasy http://mg.debian.net/
+Location: Antananarivo
+
+Site: debian.mirror.evertje.net
+Type: leaf
+Archive-architecture: amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 s390x
+Archive-http: /debian/
+IPv6: yes
+Archive-upstream: ftp.nl.debian.org
+Updates: twice
+Maintainer: E. van Harten <noc@evertjenetworks.nl>
+Country: NL Netherlands
+Bandwidth: 1Gbps
+
+Site: mirror.nl.leaseweb.net
+Type: Push-Secondary
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
+Archive-ftp: /debian/
+Archive-http: /debian/
+Archive-rsync: debian/
+Archive-upstream: ftp.nl.debian.org
+Archive-method: push
+Backports-ftp: /debian-backports/
+Backports-http: /debian-backports/
+Backports-rsync: debian-backports/
+Backports-upstream: ftp2.de.debian.org
+CDImage-ftp: /debian-cd/
+CDImage-http: /debian-cd/
+CDImage-rsync: debian-cd/
+CDImage-upstream: cdimage.debian.org
+Old-ftp: /debian-archive/
+Old-http: /debian-archive/
+Old-rsync: debian-archive/
+Volatile-ftp: /debian-volatile/
+Volatile-http: /debian-volatile/
+Volatile-rsync: debian-volatile/
+Volatile-upstream: volatile-master.debian.org
+IPv6: yes
+Maintainer: Jeffrey Kriegsman <mirror@leaseweb.com>
+Country: NL Netherlands
+Location: EvoSwitch DC, Haarlem, The Netherlands
+Sponsor: LeaseWeb B.V. http://www.leaseweb.com/
+Bandwidth: 4Gbps
+
+Site: mirror.de.leaseweb.net
+Type: Push-Secondary
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
+Archive-ftp: /debian/
+Archive-http: /debian/
+Archive-rsync: debian/
+Archive-method: push
+Archive-upstream: ftp2.de.debian.org
+Backports-ftp: /debian-backports/
+Backports-http: /debian-backports/
+Backports-rsync: debian-backports/
+Backports-upstream: ftp2.de.debian.org
+Backports-method: push
+CDImage-ftp: /debian-cd/
+CDImage-http: /debian-cd/
+CDImage-rsync: debian-cd/
+CDImage-upstream: ftp2.de.debian.org
+Volatile-ftp: /debian-volatile/
+Volatile-http: /debian-volatile/
+Volatile-rsync: debian-volatile/
+Volatile-upstream: ftp2.de.debian.org
+IPv6: yes
+Updates: push
+Maintainer: Jeffrey Kriegsman <mirror@leaseweb.com>
+Country: DE Germany
+Location: Databurg, Franfurt, Germany
+Sponsor: LeaseWeb B.V. http://www.leaseweb.com/
+Bandwidth: 4Gbps
+
+Site: mirror.us.leaseweb.net
+Type: leaf
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
+Archive-ftp: /debian/
+Archive-http: /debian/
+Archive-rsync: debian/
+Archive-upstream: ftp.us.debian.org
+Backports-ftp: /debian-backports/
+Backports-http: /debian-backports/
+Backports-rsync: debian-backports/
+Backports-upstream: mirror.nl.leaseweb.net
+CDImage-ftp: /debian-cd/
+CDImage-http: /debian-cd/
+CDImage-rsync: debian-cd/
+CDImage-upstream: cdimage.debian.org
+Volatile-ftp: /debian-volatile/
+Volatile-http: /debian-volatile/
+Volatile-rsync: debian-volatile/
+Volatile-upstream: mirror.nl.leaseweb.net
+IPv6: yes
+Updates: four
+Maintainer: Jeffrey Kriegsman <mirror@leaseweb.com>
+Country: US United States
+Location: Manassas, Virginia
+Sponsor: LeaseWeb B.V. http://www.leaseweb.com/
+Bandwidth: 4Gbps
+
+Site: debian.cabletel.com.mk
+Type: leaf
+Archive-architecture: amd64 armhf i386 kfreebsd-amd64 kfreebsd-i386 s390x
+Archive-http: /debian/
+Archive-upstream: ftp.bg.debian.org
+X-CDImage-http: /debian-cd/
+CDImage-upstream: ftp.uni-sofia.bg
+IPv6: no
+Updates: twice
+Maintainer: Free Software Macedonia <info@slobodensoftver.org.mk>
+Country: MK Macedonia
+Location: Skopje
+Sponsor: CableTel Macedonia http://cabletel.com.mk
+Bandwidth: 1Gbps
+
+Site: debian.ec.as6453.net
+Type: leaf
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
+Archive-ftp: /debian/
+Archive-http: /debian/
+IPv6: yes
+Archive-upstream: debian.osuosl.org
+Updates: twice
+Maintainer: Alex <debian-m@as6453.net>
+Country: US United States
+Bandwidth: 1Gbps
+
+Site: mirrors.tecnoera.com
+Type: leaf
+Archive-architecture: amd64 armhf i386 s390x
+Archive-http: /debian/
+IPv6: no
+Archive-upstream: rocky-mountain.csail.mit.edu
+Updates: twice
+Maintainer: Juan Pablo Abuyeres <jpabuyer@tecnoera.com>, mirrors@tecnoera.com
+Country: CL Chile
+Location: VINA DEL MAR
+Sponsor: TECNOERA http://www.tecnoera.com/
+Bandwidth: 1Gbps
+
+Site: ftp.tsukuba.wide.ad.jp
+Type: leaf
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
+Archive-http: /debian/
+Archive-rsync: debian/
+IPv6: yes
+Archive-upstream: ftp2.jp.debian.org
+Updates: twice
+Maintainer: Kohei Takahashi <tsukuba-ftp-servers@tsukuba.wide.ad.jp>
+Country: JP Japan
+Location: Tsukuba
+Comment: Update frequency: 4 times a day
+Bandwidth: 1Gbps
+
+Site: mirrors.serverhost.ro
+Type: leaf
+Archive-architecture: amd64 armhf i386 kfreebsd-amd64 kfreebsd-i386 s390x
+Archive-http: /debian/
+IPv6: no
+Archive-upstream: ftp.ro.debian.org
+Updates: twice
+Maintainer: Dan Nicolae <dan@dcnet.ro>, Victor Nitu <victor@debian-linux.ro>
+Country: RO Romania
+Location: Bucharest, Romania
+Sponsor: Serverhost http://www.serverhost.ro/
+
+Site: ftp.sv.debian.org
+Includes: debian.salud.gob.sv
+Type: Push-Primary
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
+Archive-ftp: /debian/
+Archive-http: /debian/
+Archive-rsync: debian/
+Archive-upstream: syncproxy2.eu.debian.org
+IPv6: no
+Country: SV El Salvador
+
+Site: debian.salud.gob.sv
+Aliases: mirror.salud.gob.sv
+Type: Push-Secondary
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
+Archive-ftp: /debian/
+Archive-http: /debian/
+Archive-upstream: syncproxy2.eu.debian.org
+Archive-method: push
+Backports-ftp: /debian-backports/
+Backports-http: /debian-backports/
+Backports-upstream: debian.cs.binghamton.edu
+CDImage-ftp: /debian-cd/
+CDImage-http: /debian-cd/
+CDImage-upstream: ftp.ndlug.nd.edu
+IPv6: no
+Updates: twice
+Maintainer: Carlos Juan Martin Perez <cmartin@mspas.gob.sv>, mirror@salud.gob.sv
+Country: SV El Salvador
+Location: San Salvador
+Sponsor: Ministerio de Salud de El Salvador http://www.salud.gob.sv/
+Bandwidth: 24Mbps
+
+Site: merlin.fit.vutbr.cz
+Type: leaf
+Archive-architecture: amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 mips
+Archive-http: /debian/
+Archive-rsync: debian/
+IPv6: yes
+Archive-upstream: ftp.cz.debian.org
+Updates: once
+Maintainer: Tomas Kasparek <kasparek@fit.vutbr.cz>
+Country: CZ Czech Republic
+Location: Brno
+Sponsor: FIT BUT http://www.fit.vutbr.cz
+
+Site: debian.doratelekom.com
+Aliases: debian.doratelekom.com
+Type: leaf
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
+Archive-http: /debian/
+IPv6: no
+Archive-upstream: ftp.tr.debian.org
+Updates: push
+Maintainer: Levent YILDIRIM <noc@doratelekom.com.tr>
+Country: TR Turkey
+Location: Istanbul
+Sponsor: Dora Telekom http://www.doratelekom.com.tr/
+Bandwidth: 300Mbps
+
+Site: mirrors.gigenet.com
+Type: leaf
+Archive-architecture: amd64 armhf i386 s390x
+Archive-http: /debian/
+X-CDImage-http: /debian-cd/
+IPv6: no
+Archive-upstream: ftp-nyc.osuosl.org
+CDImage-upstream: ftp-nyc.osuosl.org
+Updates: twice
+Maintainer: Jeremy May <mirrors@gigenet.com>
+Country: US United States
+Location: Arlington Heights, Il
+Sponsor: GigeNet http://www.gigenet.com
+Bandwidth: 1Gbps
+
+Site: ftp.crifo.org
+Type: leaf
+CDImage-ftp: /debian-cd/
+CDImage-http: /debian-cd/
+IPv6: no
+CDImage-upstream: mirror.datacenter.by
+Updates: once
+Maintainer: Julien Crifo <mirror@crifo.org>
+Country: FR France
+Location: Paris
+Bandwidth: 90Mbps
+
+Site: mirror.crazynetwork.it
+Type: leaf
+CDImage-http: /debian-cd/
+IPv6: no
+CDImage-upstream: ftp-stud.hs-esslingen.de
+Updates: twice
+Maintainer: Andrea Iannucci <support@crazynetwork.it>
+Country: IT Italy
+Location: Roma, Lazio
+Sponsor: Crazy Network http://www.crazynetwork.it
+Bandwidth: 100Mbps
+
+Site: debian.mirror.netelligent.ca
+Type: leaf
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
+Archive-ftp: /debian/
+Archive-http: /debian/
+Archive-rsync: debian/
+X-CDImage-ftp: /debian-cd/
+X-CDImage-http: /debian-cd/
+CDImage-rsync: debian-cd/
+IPv6: no
+Archive-upstream: ftp.ca.debian.org
+CDImage-upstream: mirror.its.dal.ca
+Updates: twice
+Maintainer: Paulius G <paulius@netelligent.ca>, support@netelligent.ca
+Country: CA Canada
+Location: Montreal, Canada
+Sponsor: Netelligent http://www.netelligent.ca/
+Bandwidth: 100Mbps
+
+Site: debian.volia.net
+Aliases: mirror.volia.net
+Type: leaf
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
+Archive-ftp: /debian/
+Archive-http: /debian/
+Archive-rsync: debian/
+Backports-ftp: /debian-backports/
+Backports-http: /debian-backports/
+Backports-rsync: debian-backports/
+CDImage-ftp: /debian-cd/
+CDImage-http: /debian-cd/
+CDImage-rsync: debian-cd/
+Old-ftp: /debian-archive/
+Old-http: /debian-archive/
+Old-rsync: debian-archive/
+IPv6: no
+Archive-upstream: ftp.si.debian.org
+Backports-upstream: ftp.uk.debian.org
+CDImage-upstream: cdimage.debian.org
+Maintainer: Denys Gavrysh <denys@volia.net>
+Country: UA Ukraine
+Location: Kiev
+Sponsor: Volia Broad Band http://www.volia.com/
+Bandwidth: 1 Gbps
+
+Site: mirrors.eastera.tj
+Type: leaf
+Archive-architecture: amd64 armhf i386 s390x
+Archive-http: /debian/
+IPv6: no
+Archive-upstream: ftp.de.debian.org
+Updates: once
+Maintainer: Anton Dutov <anton.dutov@eastera.tj>
+Country: TJ Tajikistan
+Bandwidth: 1Gbps
+Comment: other countries limited to 256kbps
+Restricted-to: country
+Sponsor: Eeatera http://eastera.tj/
+
+Site: mirror.pmf.kg.ac.rs
+Type: leaf
+Archive-architecture: amd64 armhf i386 kfreebsd-amd64 s390x
+Archive-ftp: /debian/
+Archive-http: /debian/
+X-CDImage-ftp: /debian-cd/
+X-CDImage-http: /debian-cd/
+IPv6: no
+Archive-upstream: ftp.cz.debian.org
+CDImage-upstream: ftp.cz.debian.org
+Maintainer: mirror.pmf@gmail.com
+Country: RS Serbia
+Location: Kragujevac
+Sponsor: Faculty of Science http://imi.pmf.kg.ac.rs/
+Bandwidth: 100 Mbps
+
+Site: noodle.portalias.net
+Type: Push-Secondary
+Archive-architecture: i386
+Archive-ftp: /debian/
+Archive-http: /debian/
+Archive-rsync: debian/
+Archive-upstream: ftp.halifax.rwth-aachen.de
+Backports-ftp: /debian-backports/
+Backports-http: /debian-backports/
+Backports-rsync: debian-backports/
+Backports-upstream: ftp.de.debian.org
+IPv6: no
+Maintainer: Donald Norwood <mirrors@portalias.net>
+Country: US United States
+Location: Brooklyn, NY
+Sponsor: The Portalus Group http://www.portalus.com/
+
+Site: debian.skarta.net
+Type: leaf
+Archive-architecture: amd64 i386
+Archive-http: /debian/
+Archive-rsync: debian/
+IPv6: no
+Archive-upstream: mirrors.dotsrc.org
+Updates: four
+Maintainer: Martin Nielsen <martin@skarta.net>
+Country: DK Denmark
+Sponsor: Skytech http://skytech.dk
+Comment: 100 mbit
+
+Site: mirrors.sohu.com
+Type: leaf
+Archive-architecture: amd64 i386
+Archive-ftp: /debian/
+Archive-http: /debian/
+Archive-rsync: debian/
+Archive-upstream: ftp.cn.debian.org
+Backports-ftp: /debian-backports/
+Backports-http: /debian-backports/
+Backports-rsync: debian-backports/
+Backports-upstream: ftp.cn.debian.org
+CDImage-ftp: /debian-cd/
+CDImage-http: /debian-cd/
+CDImage-rsync: debian-cd/
+CDImage-upstream: cdimage.debian.org
+IPv6: no
+Maintainer: Sohu Inc <mirror@sohu-inc.com>, Wu JianQiang <jianqiangwu@sohu-inc.com>
+Country: CN China
+Location: Beijing
+
+Site: debian.daupheus.com
+Type: leaf
+X-CDImage-http: /debian-cd/
+CDImage-upstream: cdimage.debian.org
+IPv6: no
+Updates: once
+Maintainer: Dof @ Daupheus <contact@daupheus.com>
+Country: FR France
+Sponsor: daupheus.com http://www.daupheus.com/
+Bandwidth: 1Gbps
+
+Site: mirrors.mycraft.eu
+Type: leaf
+Archive-architecture: amd64 i386 ia64
+Archive-http: /debian/
+Archive-ftp: /debian/
+IPv6: no
+Archive-upstream: ftp.de.debian.org
+Updates: four
+Maintainer: Andy Klemann <german.support@bdwmail.eu>
+Country: DE Germany
+Location: K&ouml;ln
+Sponsor: Andy Klemann http://mycraft.eu
+Bandwidth: 500 MB/s
+
+Site: mirror.network.kz
+Type: leaf
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
+Archive-ftp: /debian/
+Archive-http: /debian/
+Archive-rsync: debian/
+Backports-ftp: /debian-backports/
+Backports-http: /debian-backports/
+Backports-rsync: debian-backports/
+X-CDImage-ftp: /debian-cd/
+X-CDImage-http: /debian-cd/
+CDImage-rsync: debian-cd/
+IPv6: no
+Archive-upstream: ftp.cz.debian.org
+Backports-upstream: ftp.ch.debian.org
+CDImage-upstream: ftp.by.debian.org
+Updates: once
+Maintainer: admin@network.kz <admin@network.kz>
+Country: KZ Kazakhstan
+Location: Kazakhstan, Almaty
+Sponsor: Modern Telecommunication Systems http://network.kz/
+Bandwidth: 1Gbps 
+
+Site: mirrors.syringanetworks.net
+Type: leaf
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
+Archive-ftp: /debian/
+Archive-http: /debian/
+Archive-rsync: debian/
+CDImage-ftp: /debian-cd/
+CDImage-http: /debian-cd/
+CDImage-rsync: debian-cd/
+IPv6: yes
+Archive-upstream: ftp1.us.debian.org
+CDImage-upstream: cdimage.debian.org
+Updates: four
+Maintainer: Derek Denk <mirrors@syringanetworks.net>
+Country: US United States
+Location: Boise, Idaho, United States
+Sponsor: Syringa Networks http://www.syringanetworks.net
+Bandwidth: 1Gbit/s
+
+Site: mirror.i3d.net
+Type: leaf
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
+Archive-http: /pub/debian/
+Archive-ftp: /debian/
+Archive-rsync: debian/
+Archive-upstream: ftp.nl.debian.org
+CDImage-ftp: /debian-cd/
+CDImage-http: /pub/debian-cd/
+CDImage-rsync: debian-cd/
+CDImage-upstream: mirror.nl.leaseweb.net
+Backports-ftp: /debian-backports/
+Backports-http: /pub/debian-backports/
+Backports-rsync: debian-backports/
+Backports-upstream: ftp2.de.debian.org
+Old-http: /pub/debian-archive/
+Old-ftp: /debian-archive/
+Old-rsync: debian-archive/
+Old-upstream: ftp.nl.debian.org
+IPv6: yes
+Updates: four
+Maintainer: www.i3d.net <info@i3d.net>
+Country: NL Netherlands
+Location: Rotterdam
+Sponsor: i3D.net (INTERACTIVE 3D) http://www.i3d.net/
+Bandwidth: 10Gbps
+
+Site: debian.mirror.iphh.net
+Type: leaf
+Archive-architecture: amd64 armel armhf i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x
+Archive-ftp: /debian/
+Archive-http: /debian/
+IPv6: yes
+Archive-upstream: ftp.de.debian.org
+Updates: once
+Maintainer: IPHH Mirror-Team <debian-mirror@iphh.net>
+Country: DE Germany
+Location: Hamburg
+Sponsor: IPHH http://www.iphh.net
+Bandwidth: 1Gbps
+
+Site: ftp.si.debian.org
+Includes: debmirror.amis.net 
+Type: Push-Primary
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
+Archive-ftp: /debian/
+Archive-http: /debian/
+Archive-rsync: debian/
+Archive-upstream: syncproxy2.eu.debian.org
+IPv6: no
+Country: SI Slovenia
+
+Site: debmirror.amis.net
+Type: Push-Primary
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
+Archive-ftp: /debian/
+Archive-http: /debian/
+Archive-rsync: debian/
+IPv6: no
+Archive-upstream: syncproxy2.eu.debian.org
+Updates: four 
+Maintainer: Vladimir Nikolic <vladimir.nikolic@amis.si>, debian-mirrors@amis.si
+Country: SI Slovenia
+Location: Maribor
+Sponsor: Amis http://www.amis.net
+Bandwidth: 1Gbps
+
+Site: mirror.debian.vn
+Type: leaf
+Archive-architecture: amd64 i386
+Archive-http: /debian/
+IPv6: no
+Archive-upstream: ftp.jp.debian.org
+Updates: four
+Maintainer: Debian.VN <contact@debian.vn>
+Country: VN Viet Nam
+Location: Can Tho, Viet Nam
+Sponsor: MAYCHU.NET http://www.maychu.net/
+Bandwidth: 10Mbps
+
+Site: mirrors.liquidweb.com
+Type: leaf
+Archive-architecture: amd64 i386
+Archive-http: /debian/
+Archive-rsync: debian/
+IPv6: no
+Archive-upstream: ftp.egr.msu.edu
+Updates: four
+Maintainer: Mirror Admin <mirror-admin@liquidweb.com>
+Country: US United States
+Location: Lansing, Michigan
+Sponsor: LiquidWeb http://www.liquidweb.com
+Bandwidth: 1Gbps
+
+Site: suro.ubaya.ac.id
+Type: Push-Secondary
+Archive-architecture: amd64 armel armhf i386
+Archive-http: /debian/
+Archive-rsync: debian/
+Archive-upstream: ftp.br.debian.org
+Archive-method: push 
+IPv6: no
+Updates: push
+Maintainer: Budiwijaya <budiw_1@yahoo.com>
+Country: ID Indonesia
+Location: Surabaya, Indonesia
+Sponsor: Universitas Surabaya http://www.ubaya.ac.id
+Comment: Connected to IIX/OIXP/SIX with 50Mbps and 50Mbps for International
+Bandwidth: 50Mbps
+
+Site: debian.mirror.uber.com.au
+Type: leaf
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc 
+Archive-http: /debian/
+Archive-rsync: debian/
+IPv6: yes
+Archive-upstream: ftp.au.debian.org
+Updates: four
+Maintainer: Seamus Ryan <mirrors@uber.com.au>
+Country: AU Australia
+Location: Sydney, Australia
+Sponsor: UberGlobal http://www.uber.com.au
+Comment: Site is connected to several upstream providers with several gigabit of potential capacity.
+Bandwidth: 1Gbps
+
+Site: mirror.cogentco.com
+Type: leaf
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc 
+Archive-ftp: /debian/
+Archive-http: /debian/
+Archive-rsync: debian/
+CDImage-ftp: /debian-cd/
+CDImage-http: /debian-cd/
+CDImage-rsync: debian-cd/
+IPv6: no
+Archive-upstream: mirrors.kernel.org
+CDImage-upstream: mirrors.kernel.org
+Updates: four
+Maintainer: Brad Belanger <mirror-admin@cogentco.com>
+Country: US United States
+Location: Herndon, VA
+Sponsor: Cogent Communications http://www.cogentco.com/
+Bandwidth: 1Gbps
+
+Site: ftp.neowiz.com
+Type: leaf
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
+Archive-ftp: /debian/
+Archive-http: /debian/
+Archive-rsync: debian/
+IPv6: no
+Archive-upstream: ftp.jp.debian.org 
+Updates: four
+Maintainer: peter jang <ftpadm@neowiz.com>
+Country: KR Korea
+Location: Seoul
+Sponsor: NeowizGames http://www.pmang.com
+Bandwidth: 1Gbps
+
+Site: archive.mmu.edu.my
+Type: leaf
+Archive-architecture: amd64 i386 
+Archive-http: /debian/
+Archive-upstream: ftp2.us.debian.org
+CDImage-http: /debian-cd/
+CDImage-upstream: ftp2.us.debian.org
+IPv6: yes
+Updates: four
+Maintainer: Lai Chen Haw <chenhaw@osacyber.org>
+Country: MY Malaysia
+Location: Cyberjaya, Malaysia
+Sponsor: Multimedia University Malaysia http://www.mmu.edu.my
+Bandwidth: 10Mbps
+
+Site: deb-mirror.de
+Type: leaf
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
+Archive-ftp: /debian/
+Archive-http: /debian/
+Archive-rsync: debian/
+Archive-upstream: ftp2.de.debian.org
+Backports-ftp: /debian-backports/
+Backports-http: /debian-backports/
+Backports-rsync: debian-backports/
+Backports-upstream: ftp2.de.debian.org
+CDImage-ftp: /debian-cd/
+CDImage-http: /debian-cd/
+CDImage-rsync: debian-cd/
+CDImage-upstream: ftp2.de.debian.org
+IPv6: no
+Updates: push
+Maintainer: Kevin Burger <kevinburger@gmx.net>
+Country: DE Germany
+Location: Frankfurt Optimate-Server
+Sponsor: Optimate-Server http://optimate-server.de
+Bandwidth: 1Gbps
+
+Site: mirrors.dcarsat.com.ar
+Type: leaf
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
+Archive-http: /debian/
+IPv6: no
+Archive-upstream: ftp.br.debian.org 
+Updates: four
+Maintainer: Ezequiel Mc Govern <mirrors@dcarsat.com.ar>
+Country: AR Argentina
+Location: Benavidez
+Sponsor: ARSAT http://www.arsat.com.ar
+Bandwidth: 60MBps
+
+Site: mirror.mephi.ru
+Type: Push-Primary
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
+Archive-ftp: /debian/
+Archive-http: /debian/
+Archive-rsync: debian/
+Archive-upstream: syncproxy2.eu.debian.org
+Archive-method: push
+Backports-ftp: /debian-backports/
+Backports-http: /debian-backports/
+Backports-rsync: debian-backports/
+Backports-upstream: syncproxy3.eu.debian.org
+Backports-method: push
+X-CDImage-ftp: /debian-cd/
+X-CDImage-http: /debian-cd/
+CDImage-rsync: debian-cd/
+CDImage-upstream: ftp.ru.debian.org
+Old-ftp: /debian-archive/
+Old-http: /debian-archive/
+Old-rsync: debian-archive/
+IPv6: no
+Updates: push 
+Maintainer: Andrew Savchenko <mirror@mephi.ru>
+Country: RU Russia
+Location: Russian Federation, Moscow
+Sponsor: National Research Nuclear University "MEPhI" http://mephi.ru/
+Bandwidth: 1 Gbps
+
+Site: deb.vanvps.com
+Type: leaf
+Archive-architecture: amd64 i386
+Archive-http: /debian/
+IPv6: no
+Archive-upstream: debian.osuosl.org
+Updates: four
+Maintainer: Nate Elkan <support@vanvps.com>
+Country: CA Canada
+Location: Vancouver BC, Canada
+Sponsor: vanVPS Hosting http://vanvps.com
+Bandwidth: 1 Gbps
+
+Site: mirror.easyspeedy.com
+Type: leaf
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
+Archive-ftp: /debian/
+Archive-http: /debian/
+Archive-rsync: debian/
+CDImage-ftp: /debian-cd/
+CDImage-http: /debian-cd/
+CDImage-rsync: debian-cd/
+IPv6: yes
+Archive-upstream: ftp.se.debian.org
+CDImage-upstream: ftp.se.debian.org
+Updates: four
+Maintainer: EasySpeedy <mirror@easyspeedy.com>
+Country: DK Denmark
+Location: Copenhagen, Denmark
+Sponsor: EasySpeedy http://easyspeedy.com/
+Bandwidth: 1Gbps
+
+Site: debian.insacom.cl
+Type: leaf
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
+Archive-ftp: /debian/
+Archive-http: /debian/
+IPv6: no
+Archive-upstream: ftp.cl.debian.org
+Updates: four
+Maintainer: Sandro Rossi <srossi@insacom.cl>
+Country: CL Chile
+Sponsor: Insacom http://insacom.cl
+Bandwidth: 50 Mbps
+
+Site: debianmirror.nkn.in
+Type: leaf
+Archive-architecture: amd64 armhf i386
+Archive-http: /debian/
+IPv6: yes
+Archive-upstream: ftp1.us.debian.org
+Updates: lessoften
+Maintainer: S.Gopinath <s.gopinath@nic.in>
+Country: IN India
+Location: Chennai,INDIA
+Sponsor: National Knowledge Network http://www.nkn.in/
+Bandwidth: 1Gbps
+
+Site: debian.mirror.neology.co.za
+Type: leaf
+Archive-architecture: amd64 i386 
+Archive-ftp: /debian/
+Archive-http: /debian/
+Archive-rsync: debian/
+Backports-architecture: amd64 i386 
+Backports-ftp: /debian-backports/
+Backports-http: /debian-backports/
+Backports-rsync: debian-backports/
+IPv6: yes
+Archive-upstream: ftp.uk.debian.org
+Backports-upstream: ftp.de.debian.org
+Updates: four
+Maintainer: JP Viljoen <mirroradmin@neology.co.za>
+Country: ZA South Africa
+Location: Midrand, Gauteng
+Sponsor: Neology http://neology.co.za
+Bandwidth: 100Mbps
+
+Site: mirror.picosecond.org
+Type: leaf
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mipsel powerpc s390 sparc
+Archive-ftp: /debian/
+Archive-http: /debian/
+IPv6: yes
+Archive-upstream: ftp6.us.debian.org
+Updates: four
+Maintainer: Picosecond Software Mirror Admins <mirror-support@picosecond.org>
+Country: US United States
+Location: Fremont, CA
+Sponsor: Picosecond Software http://www.picosecond.org/
+Bandwidth: 100Mbps
+
+Site: debian.mirror.constant.com
+Type: leaf
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
+Archive-http: /debian/
+IPv6: yes
+Archive-upstream: ftp2.us.debian.org
+Updates: four
+Maintainer: Brian Rak <mirrors@constant.com>
+Country: US United States
+Location: Piscataway, New Jersey
+Sponsor: Constant.com http://www.constant.com
+Bandwidth: 1Gbps
+
+Site: debian.opensourcemirror.com
+Type: leaf
+Archive-architecture: amd64 armel i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel s390 s390x sparc
+Archive-http: /debian/
+IPv6: no
+Archive-upstream: syncproxy.eu.debian.org
+Updates: twice
+Maintainer: Chevillot Benoit <admin@opensourcemirror.com>
+Country: FR France
+Location: Roubaix, France
+Sponsor: Divioseo http://divioseo.fr
+Bandwidth: 100Mbps
+
+Site: kartolo.sby.datautama.net.id
+Type: leaf
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
+Archive-http: /debian/
+Archive-rsync: debian/
+Archive-upstream: ftp6.us.debian.org
+Backports-http: /debian-backports/
+Backports-rsync: debian-backports/
+Backports-upstream: ftp6.us.debian.org
+CDImage-http: /debian-cd/
+CDImage-rsync: debian-cd/
+CDImage-upstream: cdimage.debian.org
+IPv6: yes
+Updates: four
+Maintainer: mirrors-admin <mirrors-admin@sby.datautama.net.id>
+Country: ID Indonesia
+Location: Surabaya, East Java, Indonesia
+Sponsor: DATAUTAMA-NET-ID http://datautama.net.id/
+Bandwitdh: 100Mbps
+Comment: 100 Mbps global, 1 Gbps IIX-JI (Indonesia Internet Exchange - Jawa Timur), 1 Gbps ODIX (Omadata Internet Exchange)
+
+Site: mirror.stshosting.co.uk
+Type: Push-Secondary
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
+Archive-ftp: /debian/
+Archive-http: /debian/
+Archive-rsync: debian/
+Backports-ftp: /debian-backports/
+Backports-http: /debian-backports/
+Backports-rsync: debian-backports/
+IPv6: no
+Archive-upstream: ftp.uk.debian.org
+Backports-upstream: ftp.uk.debian.org
+Updates: push
+Maintainer: Anthony Somerset <contact@somersettechsolutions.co.uk>
+Country: GB United Kingdom
+Location: Coventry, United Kingdom
+Sponsor: Somerset Technical Solutions LTD http://www.somersettechsolutions.co.uk
+Comment: Working to add IPv6
+Bandwidth: 100Mbps
+
+Site: mirrors.advancedhosters.com
+Type: leaf
+Archive-architecture: amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
+Archive-ftp: /debian/
+Archive-http: /debian/
+Archive-rsync: debian/
+Archive-upstream: mirror.cogentco.com
+Backports-ftp: /debian-backports/
+Backports-http: /debian-backports/
+Backports-rsync: debian/
+Backports-upstream: debian.gtisc.gatech.edu
+CDImage-ftp: /debian-cd/
+CDImage-http: /debian-cd/
+CDImage-rsync: debian-cd/
+CDImage-upstream: mirror.cogentco.com
+Old-ftp: /debian-archive/
+Old-http: /debian-archive/
+Old-rsync: debian-archive/
+IPv6: no
+Updates: four
+Maintainer: Igor Butsan <mirror-admins@advancedhosters.com>
+Country: US United States
+Location: Ashburn, VA
+Sponsor: AdvancedHosters http://www.advancedhosters.com
+Bandwidth: 2Gbps 
