diff --git a/winsup/doc/sites.texinfo b/winsup/doc/sites.texinfo
index e81b448d6..a68376c10 100644
--- a/winsup/doc/sites.texinfo
+++ b/winsup/doc/sites.texinfo
@@ -12,16 +12,17 @@ You can always find an up-to-date list of mirrors at
 @c been transient or a simple typo.  It would be nice to automate this,
 @c perhaps against the cygwin/mirrors.html page.
 
+@c NB: Have to pull commented items out of list structure, otherwise
+@c looks bad in readme.txt.  They're at the bottom.  (Actually, it looks
+@c bad anyway.)
+
 @itemize @bullet
 @item North America:
 @itemize @bullet
-@c @item Alberta: @file{ftp://ftp.reversion.ca/pub/mirrors/cygwin/}
-@c @item Arizona: @file{ftp://ftp.ninemoons.com/pub/cygwin/}
-@item California: @file{ftp://ftp.yggdrasil.com/mirrors/site/sourceware.cygnus.com/pub/cygwin/}
+@item California: @file{ftp://ftp.freesoftware.com/pub/sourceware/cygwin/}
 @item California : @file{ftp://sourceware.cygnus.com/pub/cygwin/} (This
 is the "master" site, and is almost always too busy to permit logins.)
-@c @item Kansas: @file{ftp://ftp.the-b.org/pub/cygwin/}
-@c @item Tennessee: @file{ftp://ftp.sunsite.utk.edu/pub/cygwin/}
+@item Tennessee: @file{ftp://ftp.sunsite.utk.edu/pub/cygwin/}
 @end itemize
 
 @c @item Central America:
@@ -47,7 +48,6 @@ is the "master" site, and is almost always too busy to permit logins.)
 @item Japan: @file{ftp://ring.crl.go.jp/archives/pc/gnu-win32/}
 @item Japan: @file{ftp://ring.astem.or.jp/archives/pc/gnu-win32/}
 @item Japan: @file{ftp://ring.jah.ne.jp/archives/pc/gnu-win32/}
-@c @item Japan: @file{ftp://ring.saitama-u.ac.jp/archives/pc/gnu-win32/}
 @item Japan: @file{ftp://ring.nacsis.ac.jp/archives/pc/gnu-win32/}
 @item Japan: @file{ftp://ring.exp.fujixerox.co.jp/archives/pc/gnu-win32/}
 @item Japan: @file{ftp://ring.so-net.ne.jp/archives/pc/gnu-win32/}
@@ -68,22 +68,29 @@ is the "master" site, and is almost always too busy to permit logins.)
 @item Austria: @file{ftp://gd.tuwien.ac.at/gnu/cygwin/}
 @item Czech Republic: @file{ftp://sunsite.ms.mff.cuni.cz/MIRRORS/sourceware.cygnus.com/pub/cygwin/}
 @item Denmark: @file{ftp://sunsite.auc.dk/pub/cygwin/}
-@c @item Finland: @file{ftp://ftp.funet.fi/mirrors/sourceware.cygnus.com/pub/cygwin/}
+@item France: @file{ftp://ludique.u-bourgogne.fr/pub/mirror/cygwin/}
 @item Germany: @file{ftp://ftp.franken.de/pub/win32/develop/gnuwin32/cygwin/mirrors/cygnus/}
 @item Greece: @file{ftp://ftp.ntua.gr/pub/pc/cygwin/}
-@c @item Hungary: @file{ftp://ftp.szrmkk.hu/pub/gnu-win32/ftp.cygnus.com/}
 @item Italy: @file{ftp://ftp.unina.it/pub/Unix/cygnus/cygwin/}
 @item Poland: @file{ftp://sunsite.icm.edu.pl/pub/cygnus/cygwin/}
-@c @item Slovenia: @file{ftp://sunsite.fri.uni-lj.si/pub/gnu-win32/}
 @item Spain: @file{ftp://ftp.rediris.es/mirror/cygwin}
 @item Sweden: @file{ftp://ftp.sunet.se/pub/lang/cygwin/}
 @item Switzerland: @file{ftp://sunsite.cnlab-switch.ch/mirror/cygwin/}
 @item UK: @file{ftp://sunsite.org.uk/Mirrors/sourceware.cygnus.com/pub/cygwin/}
-@c @item UK: @file{ftp://ftp.ccp14.dl.ac.uk/ccp14/ftp-mirror/programming/cygnus-gnu-win32/pub/gnu-win32/}
 @item UK: @file{ftp://ftp.mirror.ac.uk/sites/sourceware.cygnus.com/pub/cygwin/}
 @end itemize
 @end itemize
 
+@c @item Alberta: @file{ftp://ftp.reversion.ca/pub/mirrors/cygwin/}
+@c @item Arizona: @file{ftp://ftp.ninemoons.com/pub/cygwin/}
+@c @item California: @file{ftp://ftp.yggdrasil.com/mirrors/site/sourceware.cygnus.com/pub/cygwin/}
+@c @item Kansas: @file{ftp://ftp.the-b.org/pub/cygwin/}
+@c @item Japan: @file{ftp://ring.saitama-u.ac.jp/archives/pc/gnu-win32/}
+@c @item Finland: @file{ftp://ftp.funet.fi/mirrors/sourceware.cygnus.com/pub/cygwin/}
+@c @item Hungary: @file{ftp://ftp.szrmkk.hu/pub/gnu-win32/ftp.cygnus.com/}
+@c @item Slovenia: @file{ftp://sunsite.fri.uni-lj.si/pub/gnu-win32/}
+@c @item UK: @file{ftp://ftp.ccp14.dl.ac.uk/ccp14/ftp-mirror/programming/cygnus-gnu-win32/pub/gnu-win32/}
+
 @section The Cygwin Project WWW Site
 
 The main WWW page for the Cygwin project is