Update list of FTP sites.

Approved by:	jhb

1 files changed, 117 insertions, 124 deletions

diff --git a/usr.sbin/sade/menus.c b/usr.sbin/sade/menus.c
index 201b7ce..1db62e7 100644
--- a/usr.sbin/sade/menus.c
+++ b/usr.sbin/sade/menus.c
@@ -510,11 +510,11 @@ DMenu MenuMediaFTP = {
     "Please select a FreeBSD FTP distribution site",
     "Please select the site closest to you or \"other\" if you'd like to\n"
     "specify a different choice.  Also note that not every site listed here\n"
-    "carries more than the base distribution kits. Only the Primary site is\n"
+    "carries more than the base distribution kits. Only Primary sites are\n"
     "guaranteed to carry the full range of possible distributions.",
     "Select a site that's close!",
     "INSTALL",
-    { { "Primary Site",	"ftp.freebsd.org", NULL, dmenuSetVariable, NULL,
+    { { "Main Site",	"ftp.freebsd.org", NULL, dmenuSetVariable, NULL,
 	VAR_FTP_PATH "=ftp://ftp.freebsd.org" },
       { "URL", "Specify some other ftp site by URL", NULL, dmenuSetVariable, NULL,
 	VAR_FTP_PATH "=other" },
@@ -524,30 +524,56 @@ DMenu MenuMediaFTP = {
 	VAR_FTP_PATH "=ftp://releng4.freebsd.org" },
       { " jp.FreeBSD.org SNAP Server", "snapshots.jp.freebsd.org", NULL, dmenuSetVariable, NULL,
 	VAR_FTP_PATH "=ftp://snapshots.jp.freebsd.org" },
-      { " IPv6 Ready", "ftp2.jp.freebsd.org", NULL, dmenuSetVariable, NULL,
+
+      { "IPv6 Ready", "ftp4.us.freebsd.org", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://ftp4.us.freebsd.org" },
+      { " IPv6 Ready #2", "ftp2.jp.freebsd.org", NULL, dmenuSetVariable, NULL,
 	VAR_FTP_PATH "=ftp://ftp2.jp.freebsd.org" },
-      { " IPv6 Ready #2", "ftp7.jp.freebsd.org", NULL, dmenuSetVariable, NULL,
-	VAR_FTP_PATH "=ftp://ftp7.jp.freebsd.org" },
       { " IPv6 Ready #3", "ftp3.ie.freebsd.org", NULL, dmenuSetVariable, NULL,
 	VAR_FTP_PATH "=ftp://ftp3.ie.freebsd.org" },
+
+      { "Primary",	"ftp1.freebsd.org", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://ftp1.freebsd.org" },
+      { " Primary #2",	"ftp2.freebsd.org", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://ftp2.freebsd.org" },
+      { " Primary #3",	"ftp3.freebsd.org", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://ftp3.freebsd.org" },
+      { " Primary #4",	"ftp4.freebsd.org", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://ftp4.freebsd.org" },
+      { " Primary #5",	"ftp5.freebsd.org", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://ftp5.freebsd.org" },
+      { " Primary #6",	"ftp6.freebsd.org", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://ftp6.freebsd.org" },
+      { " Primary #7",	"ftp7.freebsd.org", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://ftp7.freebsd.org" },
+      { " Primary #8",	"ftp8.freebsd.org", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://ftp8.freebsd.org" },
+      { " Primary #9",	"ftp9.freebsd.org", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://ftp9.freebsd.org" },
+      { " Primary #10",	"ftp10.freebsd.org", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://ftp10.freebsd.org" },
+      { " Primary #11",	"ftp11.freebsd.org", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://ftp11.freebsd.org" },
+      { " Primary #12",	"ftp12.freebsd.org", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://ftp12.freebsd.org" },
+      { " Primary #13",	"ftp13.freebsd.org", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://ftp13.freebsd.org" },
+      { " Primary #14",	"ftp14.freebsd.org", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://ftp14.freebsd.org" },
+
       { "Argentina",	"ftp.ar.freebsd.org", NULL, dmenuSetVariable, NULL,
 	VAR_FTP_PATH "=ftp://ftp.ar.freebsd.org" },
+
       { "Australia",	"ftp.au.freebsd.org", NULL, dmenuSetVariable, NULL,
 	VAR_FTP_PATH "=ftp://ftp.au.freebsd.org" },
       { " Australia #2","ftp2.au.freebsd.org", NULL, dmenuSetVariable, NULL,
 	VAR_FTP_PATH "=ftp://ftp2.au.freebsd.org" },
-      { " Australia #3","ftp3.au.freebsd.org", NULL, dmenuSetVariable, NULL,
-	VAR_FTP_PATH "=ftp://ftp3.au.freebsd.org" },
-      { " Australia #4","ftp4.au.freebsd.org", NULL, dmenuSetVariable, NULL,
-	VAR_FTP_PATH "=ftp://ftp4.au.freebsd.org" },
-      { " Australia #5","ftp5.au.freebsd.org", NULL, dmenuSetVariable, NULL,
-	VAR_FTP_PATH "=ftp://ftp5.au.freebsd.org" },
-      { " Australia #6","ftp6.au.freebsd.org", NULL, dmenuSetVariable, NULL,
-	VAR_FTP_PATH "=ftp://ftp6.au.freebsd.org" },
-      { "Austria",	"ftp.at.freebsd.org", NULL, dmenuSetVariable, NULL,
+
+      { "Austria","ftp.at.freebsd.org", NULL, dmenuSetVariable, NULL,
 	VAR_FTP_PATH "=ftp://ftp.at.freebsd.org" },
-      { " Austria #2",	"ftp2.at.freebsd.org", NULL, dmenuSetVariable, NULL,
+      { " Austria #2","ftp2.at.freebsd.org", NULL, dmenuSetVariable, NULL,
 	VAR_FTP_PATH "=ftp://ftp2.at.freebsd.org" },
+
       { "Brazil",	"ftp.br.freebsd.org", NULL, dmenuSetVariable, NULL,
 	VAR_FTP_PATH "=ftp://ftp.br.freebsd.org" },
       { " Brazil #2",	"ftp2.br.freebsd.org", NULL, dmenuSetVariable, NULL,
@@ -562,58 +588,45 @@ DMenu MenuMediaFTP = {
 	VAR_FTP_PATH "=ftp://ftp6.br.freebsd.org" },
       { " Brazil #7",	"ftp7.br.freebsd.org", NULL, dmenuSetVariable, NULL,
 	VAR_FTP_PATH "=ftp://ftp7.br.freebsd.org" },
-      /*
-      { "Bulgaria",	"ftp.bg.freebsd.org", NULL, dmenuSetVariable, NULL,
-	VAR_FTP_PATH "=ftp://ftp.bg.freebsd.org" },
-      */
+
       { "Canada",	"ftp.ca.freebsd.org", NULL, dmenuSetVariable, NULL,
 	VAR_FTP_PATH "=ftp://ftp.ca.freebsd.org" },
-      /*
-      { " Canada #2",	"ftp2.ca.freebsd.org", NULL, dmenuSetVariable, NULL,
-	VAR_FTP_PATH "=ftp://ftp2.ca.freebsd.org" },
-      */
+
       { "China",	"ftp.cn.freebsd.org", NULL, dmenuSetVariable, NULL,
 	VAR_FTP_PATH "=ftp://ftp.cn.freebsd.org" },
-      { " China #2",	"ftp2.cn.freebsd.org", NULL, dmenuSetVariable, NULL,
-	VAR_FTP_PATH "=ftp://ftp2.cn.freebsd.org" },
-      { " China #3",	"ftp3.cn.freebsd.org", NULL, dmenuSetVariable, NULL,
-	VAR_FTP_PATH "=ftp://ftp3.cn.freebsd.org" },
+
+      { "Croatia",	"ftp.hr.freebsd.org", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://ftp.hr.freebsd.org" },
+
       { "Czech Republic", "ftp.cz.freebsd.org", NULL, dmenuSetVariable, NULL,
-	VAR_FTP_PATH	"=ftp://ftp.cz.freebsd.org" },
-      { "Denmark (Primary)",	"ftp.freebsd.org", NULL, dmenuSetVariable, NULL,
-	VAR_FTP_PATH "=ftp://ftp.dk.freebsd.org" },
-      { " Denmark",	"ftp.dk.freebsd.org", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://ftp.cz.freebsd.org" },
+
+      { "Denmark",	"ftp.dk.freebsd.org", NULL, dmenuSetVariable, NULL,
 	VAR_FTP_PATH "=ftp://ftp.dk.freebsd.org" },
       { " Denmark #2",	"ftp2.dk.freebsd.org", NULL, dmenuSetVariable, NULL,
 	VAR_FTP_PATH "=ftp://ftp2.dk.freebsd.org" },
-      { " Denmark #3",	"ftp3.dk.freebsd.org", NULL, dmenuSetVariable, NULL,
-	VAR_FTP_PATH "=ftp://ftp3.dk.freebsd.org" },
+
       { "Estonia",	"ftp.ee.freebsd.org", NULL, dmenuSetVariable, NULL,
 	VAR_FTP_PATH "=ftp://ftp.ee.freebsd.org" },
+
       { "Finland",	"ftp.fi.freebsd.org", NULL, dmenuSetVariable, NULL,
 	VAR_FTP_PATH "=ftp://ftp.fi.freebsd.org" },
-      { " Finland #3",	"ftp3.fi.freebsd.org", NULL, dmenuSetVariable, NULL,
-	VAR_FTP_PATH "=ftp://ftp3.fi.freebsd.org" },
+
       { "France",	"ftp.fr.freebsd.org", NULL, dmenuSetVariable, NULL,
 	VAR_FTP_PATH "=ftp://ftp.fr.freebsd.org" },
       { " France #2",	"ftp2.fr.freebsd.org", NULL, dmenuSetVariable, NULL,
 	VAR_FTP_PATH "=ftp://ftp2.fr.freebsd.org" },
       { " France #3",	"ftp3.fr.freebsd.org", NULL, dmenuSetVariable, NULL,
 	VAR_FTP_PATH "=ftp://ftp3.fr.freebsd.org" },
-      /*
       { " France #4",	"ftp4.fr.freebsd.org", NULL, dmenuSetVariable, NULL,
 	VAR_FTP_PATH "=ftp://ftp4.fr.freebsd.org" },
-      */
       { " France #5",	"ftp5.fr.freebsd.org", NULL, dmenuSetVariable, NULL,
 	VAR_FTP_PATH "=ftp://ftp5.fr.freebsd.org" },
       { " France #6",	"ftp6.fr.freebsd.org", NULL, dmenuSetVariable, NULL,
 	VAR_FTP_PATH "=ftp://ftp6.fr.freebsd.org" },
-      /*
-      { " France #7",	"ftp7.fr.freebsd.org", NULL, dmenuSetVariable, NULL,
-	VAR_FTP_PATH "=ftp://ftp7.fr.freebsd.org" },
-      */
       { " France #8",	"ftp8.fr.freebsd.org", NULL, dmenuSetVariable, NULL,
 	VAR_FTP_PATH "=ftp://ftp8.fr.freebsd.org" },
+
       { "Germany",	"ftp.de.freebsd.org", NULL, dmenuSetVariable, NULL,
 	VAR_FTP_PATH "=ftp://ftp.de.freebsd.org" },
       { " Germany #2",	"ftp2.de.freebsd.org", NULL, dmenuSetVariable, NULL,
@@ -628,32 +641,28 @@ DMenu MenuMediaFTP = {
 	VAR_FTP_PATH "=ftp://ftp6.de.freebsd.org" },
       { " Germany #7",	"ftp7.de.freebsd.org", NULL, dmenuSetVariable, NULL,
 	VAR_FTP_PATH "=ftp://ftp7.de.freebsd.org" },
+
       { "Greece",	"ftp.gr.freebsd.org", NULL, dmenuSetVariable, NULL,
 	VAR_FTP_PATH "=ftp://ftp.gr.freebsd.org" },
       { " Greece #2",	"ftp2.gr.freebsd.org", NULL, dmenuSetVariable, NULL,
 	VAR_FTP_PATH "=ftp://ftp2.gr.freebsd.org" },
-      { "Hong Kong",	"ftp.hk.freebsd.org", NULL, dmenuSetVariable, NULL,
-	VAR_FTP_PATH "=ftp://ftp.hk.freebsd.org" },
-      { "Hungary",	"ftp.hu.freebsd.org", NULL, dmenuSetVariable, NULL,
+
+      { "Hong Kong",	"ftp.hk.super.net", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://ftp.hk.super.net" },
+
+      { "Hungary",     "ftp.hu.freebsd.org", NULL, dmenuSetVariable, NULL,
 	VAR_FTP_PATH "=ftp://ftp.hu.freebsd.org" },
-      /*
-      { " Hungary #2",	"ftp2.hu.freebsd.org", NULL, dmenuSetVariable, NULL,
-	VAR_FTP_PATH "=ftp://ftp2.hu.freebsd.org" },
-      */
+
       { "Iceland",	"ftp.is.freebsd.org", NULL, dmenuSetVariable, NULL,
 	VAR_FTP_PATH "=ftp://ftp.is.freebsd.org" },
+
       { "Ireland",	"ftp.ie.freebsd.org", NULL, dmenuSetVariable, NULL,
 	VAR_FTP_PATH "=ftp://ftp.ie.freebsd.org" },
       { " Ireland #2",	"ftp2.ie.freebsd.org", NULL, dmenuSetVariable, NULL,
 	VAR_FTP_PATH "=ftp://ftp2.ie.freebsd.org" },
       { " Ireland #3",	"ftp3.ie.freebsd.org", NULL, dmenuSetVariable, NULL,
 	VAR_FTP_PATH "=ftp://ftp3.ie.freebsd.org" },
-      { "Israel",	"ftp.il.freebsd.org", NULL, dmenuSetVariable, NULL,
-	VAR_FTP_PATH "=ftp://ftp.il.freebsd.org" },
-      { " Israel #2",	"ftp2.il.freebsd.org", NULL, dmenuSetVariable, NULL,
-	VAR_FTP_PATH "=ftp://ftp2.il.freebsd.org" },
-      { "Italy",	"ftp.it.freebsd.org", NULL, dmenuSetVariable, NULL,
-	VAR_FTP_PATH "=ftp://ftp.it.freebsd.org" },
+
       { "Japan",	"ftp.jp.freebsd.org", NULL, dmenuSetVariable, NULL,
 	VAR_FTP_PATH "=ftp://ftp.jp.freebsd.org" },
       { " Japan #2",	"ftp2.jp.freebsd.org", NULL, dmenuSetVariable, NULL,
@@ -668,46 +677,40 @@ DMenu MenuMediaFTP = {
 	VAR_FTP_PATH "=ftp://ftp6.jp.freebsd.org" },
       { " Japan #7",	"ftp7.jp.freebsd.org", NULL, dmenuSetVariable, NULL,
 	VAR_FTP_PATH "=ftp://ftp7.jp.freebsd.org" },
+
       { "Korea",	"ftp.kr.freebsd.org", NULL, dmenuSetVariable, NULL,
 	VAR_FTP_PATH "=ftp://ftp.kr.freebsd.org" },
       { " Korea #2",	"ftp2.kr.freebsd.org", NULL, dmenuSetVariable, NULL,
 	VAR_FTP_PATH "=ftp://ftp2.kr.freebsd.org" },
       { " Korea #3",	"ftp3.kr.freebsd.org", NULL, dmenuSetVariable, NULL,
 	VAR_FTP_PATH "=ftp://ftp3.kr.freebsd.org" },
-      { " Korea #4",	"ftp4.kr.freebsd.org", NULL, dmenuSetVariable, NULL,
-	VAR_FTP_PATH "=ftp://ftp4.kr.freebsd.org" },
-      { " Korea #5",	"ftp5.kr.freebsd.org", NULL, dmenuSetVariable, NULL,
-	VAR_FTP_PATH "=ftp://ftp5.kr.freebsd.org" },
-      { " Korea #6",	"ftp6.kr.freebsd.org", NULL, dmenuSetVariable, NULL,
-	VAR_FTP_PATH "=ftp://ftp6.kr.freebsd.org" },
-      { " Korea #7",	"ftp7.kr.freebsd.org", NULL, dmenuSetVariable, NULL,
-	VAR_FTP_PATH "=ftp://ftp7.kr.freebsd.org" },
+
       { "Lithuania",	"ftp.lt.freebsd.org", NULL, dmenuSetVariable, NULL,
 	VAR_FTP_PATH "=ftp://ftp.lt.freebsd.org" },
+
       { "Netherlands",	"ftp.nl.freebsd.org", NULL, dmenuSetVariable, NULL,
 	VAR_FTP_PATH "=ftp://ftp.nl.freebsd.org" },
       { " Netherlands #2",	"ftp2.nl.freebsd.org", NULL, dmenuSetVariable, NULL,
 	VAR_FTP_PATH "=ftp://ftp2.nl.freebsd.org" },
-      { "New Zealand",	"ftp.nz.freebsd.org", NULL, dmenuSetVariable, NULL,
-	VAR_FTP_PATH "=ftp://ftp.nz.freebsd.org" },
+
       { "Norway",	"ftp.no.freebsd.org", NULL, dmenuSetVariable, NULL,
 	VAR_FTP_PATH "=ftp://ftp.no.freebsd.org" },
       { " Norway #3",	"ftp3.no.freebsd.org", NULL, dmenuSetVariable, NULL,
 	VAR_FTP_PATH "=ftp://ftp3.no.freebsd.org" },
+
       { "Poland",	"ftp.pl.freebsd.org", NULL, dmenuSetVariable, NULL,
 	VAR_FTP_PATH "=ftp://ftp.pl.freebsd.org" },
-      { " Poland #2",	"ftp2.pl.freebsd.org", NULL, dmenuSetVariable, NULL,
-	VAR_FTP_PATH "=ftp://ftp2.pl.freebsd.org" },
-      { " Poland #3",	"ftp3.pl.freebsd.org", NULL, dmenuSetVariable, NULL,
-	VAR_FTP_PATH "=ftp://ftp3.pl.freebsd.org" },
-      { "Portugal (N/A)",	"ftp.pt.freebsd.org", NULL, dmenuSetVariable, NULL,
+
+      { "Portugal",	"ftp.pt.freebsd.org", NULL, dmenuSetVariable, NULL,
 	VAR_FTP_PATH "=ftp://ftp.pt.freebsd.org" },
       { " Portugal #2",	"ftp2.pt.freebsd.org", NULL, dmenuSetVariable, NULL,
 	VAR_FTP_PATH "=ftp://ftp2.pt.freebsd.org" },
-      { " Portugal #3",	"ftp3.pt.freebsd.org", NULL, dmenuSetVariable, NULL,
-	VAR_FTP_PATH "=ftp://ftp3.pt.freebsd.org" },
+      { " Portugal #4",	"ftp4.pt.freebsd.org", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://ftp4.pt.freebsd.org" },
+
       { "Romania",	"ftp.ro.freebsd.org", NULL, dmenuSetVariable, NULL,
 	VAR_FTP_PATH "=ftp://ftp.ro.freebsd.org" },
+
       { "Russia",	"ftp.ru.freebsd.org", NULL, dmenuSetVariable, NULL,
 	VAR_FTP_PATH "=ftp://ftp.ru.freebsd.org" },
       { " Russia #2",	"ftp2.ru.freebsd.org", NULL, dmenuSetVariable, NULL,
@@ -716,18 +719,16 @@ DMenu MenuMediaFTP = {
 	VAR_FTP_PATH "=ftp://ftp3.ru.freebsd.org" },
       { " Russia #4",    "ftp4.ru.freebsd.org", NULL, dmenuSetVariable, NULL,
 	VAR_FTP_PATH "=ftp://ftp4.ru.freebsd.org" },
-      { "Saudi Arabia",	"ftp.isu.net.sa", NULL, dmenuSetVariable, NULL,
-	VAR_FTP_PATH "=ftp://ftp.isu.net.sa/pub/mirrors/ftp.freebsd.org/" },
+
       { "Singapore",	"ftp.sg.freebsd.org", NULL, dmenuSetVariable, NULL,
 	VAR_FTP_PATH "=ftp://ftp.sg.freebsd.org" },
+
       { "Slovak Republic",	"ftp.sk.freebsd.org", NULL, dmenuSetVariable, NULL,
 	VAR_FTP_PATH "=ftp://ftp.sk.freebsd.org" },
-      { " Slovak Republic #2",	"ftp2.sk.freebsd.org", NULL, dmenuSetVariable, NULL,
-	VAR_FTP_PATH "=ftp://ftp2.sk.freebsd.org" },
-      { "Slovenia (N/A)",	"ftp.si.freebsd.org", NULL, dmenuSetVariable, NULL,
-	VAR_FTP_PATH "=ftp://ftp.si.freebsd.org" },
-      { " Slovenia #2",	"ftp2.si.freebsd.org", NULL, dmenuSetVariable, NULL,
+
+      { "Slovenia",	"ftp.si.freebsd.org", NULL, dmenuSetVariable, NULL,
 	VAR_FTP_PATH "=ftp://ftp.si.freebsd.org" },
+
       { "South Africa",	"ftp.za.freebsd.org", NULL, dmenuSetVariable, NULL,
 	VAR_FTP_PATH "=ftp://ftp.za.freebsd.org" },
       { " South Africa #2", "ftp2.za.freebsd.org", NULL, dmenuSetVariable, NULL,
@@ -736,26 +737,28 @@ DMenu MenuMediaFTP = {
 	VAR_FTP_PATH "=ftp://ftp3.za.freebsd.org" },
       { " South Africa #4", "ftp4.za.freebsd.org", NULL, dmenuSetVariable, NULL,
 	VAR_FTP_PATH "=ftp://ftp4.za.freebsd.org" },
+
       { "Spain",	"ftp.es.freebsd.org", NULL, dmenuSetVariable, NULL,
 	VAR_FTP_PATH "=ftp://ftp.es.freebsd.org" },
       { " Spain #2",	"ftp2.es.freebsd.org", NULL, dmenuSetVariable, NULL,
 	VAR_FTP_PATH "=ftp://ftp2.es.freebsd.org" },
       { " Spain #3",	"ftp3.es.freebsd.org", NULL, dmenuSetVariable, NULL,
 	VAR_FTP_PATH "=ftp://ftp3.es.freebsd.org" },
+
       { "Sweden",	"ftp.se.freebsd.org", NULL, dmenuSetVariable, NULL,
 	VAR_FTP_PATH "=ftp://ftp.se.freebsd.org" },
       { " Sweden #2",	"ftp2.se.freebsd.org", NULL, dmenuSetVariable, NULL,
 	VAR_FTP_PATH "=ftp://ftp2.se.freebsd.org" },
       { " Sweden #3",	"ftp3.se.freebsd.org", NULL, dmenuSetVariable, NULL,
 	VAR_FTP_PATH "=ftp://ftp3.se.freebsd.org" },
-      /*
-      { " Sweden #4",	"ftp4.se.freebsd.org", NULL, dmenuSetVariable, NULL,
-	VAR_FTP_PATH "=ftp://ftp4.se.freebsd.org" },
-      */
       { " Sweden #5",	"ftp5.se.freebsd.org", NULL, dmenuSetVariable, NULL,
 	VAR_FTP_PATH "=ftp://ftp5.se.freebsd.org" },
+
       { "Switzerland",	"ftp.ch.freebsd.org", NULL, dmenuSetVariable, NULL,
 	VAR_FTP_PATH "=ftp://ftp.ch.freebsd.org" },
+      { " Switzerland #2",	"ftp2.ch.freebsd.org", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://ftp2.ch.freebsd.org" },
+
       { "Taiwan",	"ftp.tw.freebsd.org", NULL, dmenuSetVariable, NULL,
 	VAR_FTP_PATH "=ftp://ftp.tw.freebsd.org" },
       { " Taiwan #2",	"ftp2.tw.freebsd.org", NULL, dmenuSetVariable, NULL,
@@ -764,18 +767,9 @@ DMenu MenuMediaFTP = {
 	VAR_FTP_PATH "=ftp://ftp3.tw.freebsd.org" },
       { " Taiwan #4",   "ftp4.tw.freebsd.org", NULL, dmenuSetVariable, NULL,
 	VAR_FTP_PATH "=ftp://ftp4.tw.freebsd.org" },
-      { " Taiwan #5",   "ftp5.tw.freebsd.org", NULL, dmenuSetVariable, NULL,
-	VAR_FTP_PATH "=ftp://ftp5.tw.freebsd.org" },
       { " Taiwan #6",   "ftp6.tw.freebsd.org", NULL, dmenuSetVariable, NULL,
 	VAR_FTP_PATH "=ftp://ftp6.tw.freebsd.org" },
-      { " Taiwan #7",   "ftp7.tw.freebsd.org", NULL, dmenuSetVariable, NULL,
-	VAR_FTP_PATH "=ftp://ftp7.tw.freebsd.org" },
-      { " Taiwan #8",   "ftp8.tw.freebsd.org", NULL, dmenuSetVariable, NULL,
-	VAR_FTP_PATH "=ftp://ftp8.tw.freebsd.org" },
-      { " Taiwan #9",   "ftp9.tw.freebsd.org", NULL, dmenuSetVariable, NULL,
-	VAR_FTP_PATH "=ftp://ftp9.tw.freebsd.org" },
-      { "Thailand",	"ftp.nectec.or.th", NULL, dmenuSetVariable, NULL,
-	VAR_FTP_PATH "=ftp://ftp.nectec.or.th/pub/mirrors/FreeBSD/" },
+
       { "UK",		"ftp.uk.freebsd.org", NULL, dmenuSetVariable, NULL,
 	VAR_FTP_PATH "=ftp://ftp.uk.freebsd.org" },
       { " UK #2",	"ftp2.uk.freebsd.org", NULL, dmenuSetVariable, NULL,
@@ -788,44 +782,43 @@ DMenu MenuMediaFTP = {
 	VAR_FTP_PATH "=ftp://ftp5.uk.freebsd.org" },
       { " UK #6",	"ftp6.uk.freebsd.org", NULL, dmenuSetVariable, NULL,
 	VAR_FTP_PATH "=ftp://ftp6.uk.freebsd.org" },
+
       { "Ukraine",	"ftp.ua.freebsd.org", NULL, dmenuSetVariable, NULL,
 	VAR_FTP_PATH "=ftp://ftp.ua.freebsd.org" },
       { " Ukraine #2",	"ftp2.ua.freebsd.org", NULL, dmenuSetVariable, NULL,
 	VAR_FTP_PATH "=ftp://ftp2.ua.freebsd.org" },
       { " Ukraine #3",	"ftp3.ua.freebsd.org", NULL, dmenuSetVariable, NULL,
 	VAR_FTP_PATH "=ftp://ftp3.ua.freebsd.org" },
-      /*
-      { " Ukraine #4",	"ftp4.ua.freebsd.org", NULL, dmenuSetVariable, NULL,
-	VAR_FTP_PATH "=ftp://ftp4.ua.freebsd.org" },
-      */
-      { " Ukraine #5",	"ftp5.ua.freebsd.org", NULL, dmenuSetVariable, NULL,
-	VAR_FTP_PATH "=ftp://ftp5.ua.freebsd.org" },
-      { " USA #2",	"ftp2.freebsd.org", NULL, dmenuSetVariable, NULL,
-	VAR_FTP_PATH "=ftp://ftp2.freebsd.org" },
-      { " USA #3",	"ftp3.freebsd.org", NULL, dmenuSetVariable, NULL,
-	VAR_FTP_PATH "=ftp://ftp3.freebsd.org" },
-      { " USA #4",	"ftp4.freebsd.org", NULL, dmenuSetVariable, NULL,
-	VAR_FTP_PATH "=ftp://ftp4.freebsd.org" },
-      { " USA #5",	"ftp5.freebsd.org", NULL, dmenuSetVariable, NULL,
-	VAR_FTP_PATH "=ftp://ftp5.freebsd.org" },
-      { " USA #6",	"ftp6.freebsd.org", NULL, dmenuSetVariable, NULL,
-	VAR_FTP_PATH "=ftp://ftp6.freebsd.org" },
-      { " USA #7",	"ftp7.freebsd.org", NULL, dmenuSetVariable, NULL,
-	VAR_FTP_PATH "=ftp://ftp7.freebsd.org" },
-      { " USA #8",	"ftp8.freebsd.org", NULL, dmenuSetVariable, NULL,
-	VAR_FTP_PATH "=ftp://ftp8.freebsd.org" },
-      { " USA #9",	"ftp9.freebsd.org", NULL, dmenuSetVariable, NULL,
-	VAR_FTP_PATH "=ftp://ftp9.freebsd.org" },
-      { " USA #10",	"ftp10.freebsd.org", NULL, dmenuSetVariable, NULL,
-	VAR_FTP_PATH "=ftp://ftp10.freebsd.org" },
-      { " USA #11",	"ftp11.freebsd.org", NULL, dmenuSetVariable, NULL,
-	VAR_FTP_PATH "=ftp://ftp11.freebsd.org" },
-      { " USA #12",	"ftp12.freebsd.org", NULL, dmenuSetVariable, NULL,
-	VAR_FTP_PATH "=ftp://ftp12.freebsd.org" },
-      { " USA #13",	"ftp13.freebsd.org", NULL, dmenuSetVariable, NULL,
-	VAR_FTP_PATH "=ftp://ftp13.freebsd.org" },
-      { " USA #14",	"ftp14.freebsd.org", NULL, dmenuSetVariable, NULL,
-	VAR_FTP_PATH "=ftp://ftp14.freebsd.org" },
+
+      { "USA #1",	"ftp1.us.freebsd.org", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://ftp1.us.freebsd.org" },
+      { " USA #2",	"ftp2.us.freebsd.org", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://ftp2.us.freebsd.org" },
+      { " USA #3",	"ftp3.us.freebsd.org", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://ftp3.us.freebsd.org" },
+      { " USA #4",	"ftp4.us.freebsd.org", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://ftp4.us.freebsd.org" },
+      { " USA #5",	"ftp5.us.freebsd.org", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://ftp5.us.freebsd.org" },
+      { " USA #6",	"ftp6.us.freebsd.org", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://ftp6.us.freebsd.org" },
+      { " USA #7",	"ftp7.us.freebsd.org", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://ftp7.us.freebsd.org" },
+      { " USA #8",	"ftp8.us.freebsd.org", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://ftp8.us.freebsd.org" },
+      { " USA #9",	"ftp9.us.freebsd.org", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://ftp9.us.freebsd.org" },
+      { " USA #10",	"ftp10.us.freebsd.org", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://ftp10.us.freebsd.org" },
+      { " USA #11",	"ftp11.us.freebsd.org", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://ftp11.us.freebsd.org" },
+      { " USA #12",	"ftp12.us.freebsd.org", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://ftp12.us.freebsd.org" },
+      { " USA #13",	"ftp13.us.freebsd.org", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://ftp13.us.freebsd.org" },
+      { " USA #14",	"ftp14.us.freebsd.org", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://ftp14.us.freebsd.org" },
+
       { NULL } }
 };