Update the list of public NTP servers from

http://www.eecis.udel.edu/~mills/ntp/clock2.htm
Also remove any Stratum 1 servers and only include Stratum 2 and higher
servers.

PR:		32586
Submitted by:	Arnaud Launay <asl@launay.org>

2 files changed, 820 insertions, 64 deletions

diff --git a/usr.sbin/sade/menus.c b/usr.sbin/sade/menus.c
index ff0ee2e..09b50e6 100644
--- a/usr.sbin/sade/menus.c
+++ b/usr.sbin/sade/menus.c
@@ -1393,54 +1393,432 @@ DMenu MenuNTP = {
 	"ntpdate_enable=NO,ntpdate_flags=none" },
       { "Other",		"Select a site not on this list",
 	dmenuVarsCheck, configNTP, NULL, NULL },
-      { "Australia",		"ntp.nml.csiro.au (HP 5071A Cesium Beam)",
+      { "Argentina",		"tick.nap.com.ar",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=tick.nap.com.ar" },
+      { "Argentina #2",		"time.sinectis.com.ar",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=time.sinectis.com.ar" },
+      { "Argentina #3",		"tock.nap.com.ar",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=tock.nap.com.ar" },
+      { "Australia",		"augean.eleceng.adelaide.edu.au",
 	dmenuVarsCheck,	dmenuSetVariables, NULL, 
-	"ntpdate_enable=YES,ntpdate_flags=ntp.tip.csiro.au" },
-      { " Canada",		"tick.usask.ca (GOES clock)",
+	"ntpdate_enable=YES,ntpdate_flags=augean.eleceng.adelaide.edu.au" },
+      { "Australia #2",		"ntp.adelaide.edu.au",
 	dmenuVarsCheck,	dmenuSetVariables, NULL, 
-	"ntpdate_enable=YES,ntpdate_flags=tick.usask.ca" },
-      { "France",		"canon.inria.fr (TDF clock)",
+	"ntpdate_enable=YES,ntpdate_flags=ntp.adelaide.edu.au" },
+      { "Australia #3",		"ntp.saard.net",
 	dmenuVarsCheck,	dmenuSetVariables, NULL, 
-	"ntpdate_enable=YES,ntpdate_flags=canon.inria.fr" },
-      { "Germany",		"ntps1-{0,1,2}.uni-erlangen.de (GPS)",
+	"ntpdate_enable=YES,ntpdate_flags=ntp.saard.net" },
+      { "Australia #4",		"time.deakin.edu.au",
 	dmenuVarsCheck,	dmenuSetVariables, NULL, 
-	"ntpdate_enable=YES,ntpdate_flags=ntps1-0.uni-erlangen.de" },
-      { " Germany #2",		"ntps1-0.cs.tu-berlin.de (GPS)",
+	"ntpdate_enable=YES,ntpdate_flags=time.deakin.edu.au" },
+      { "Australia #5",		"time.esec.com.au",
 	dmenuVarsCheck,	dmenuSetVariables, NULL, 
-	"ntpdate_enable=YES,ntpdate_flags=ntps1-0.cs.tu-berlin.de" },
-      { "Japan",		"clock.nc.fukuoka-u.ac.jp (GPS clock)",
+	"ntpdate_enable=YES,ntpdate_flags=time.esec.com.au" },
+      { "Belgium",		"ntp1.belbone.be",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=ntp1.belbone.be" },
+      { "Belgium #2",		"ntp2.belbone.be",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=ntp2.belbone.be" },
+      { "Brazil",		"ntp.cais.rnp.br",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=ntp.cais.rnp.br" },
+      { "Brazil #2",		"ntp.pop-df.rnp.br",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=ntp.pop-df.rnp.br" },
+      { "Brazil #3",		"ntp.ufes.br",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=ntp.ufes.br" },
+      { "Brazil #4",		"ntp1.pucpr.br",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=ntp1.pucpr.br" },
+      { "Canada",		"ntp.cpsc.ucalgary.ca",
 	dmenuVarsCheck,	dmenuSetVariables, NULL, 
-	"ntpdate_enable=YES,ntpdate_flags=clock.nc.fukuoka-u.ac.jp" },
-      { " Japan #2",		"clock.tl.fukuoka-u.ac.jp (GPS clock)",
+	"ntpdate_enable=YES,ntpdate_flags=ntp.cpsc.ucalgary.ca" },
+      { "Canada #2",		"ntp1.cmc.ec.gc.ca",
 	dmenuVarsCheck,	dmenuSetVariables, NULL, 
-	"ntpdate_enable=YES,ntpdate_flags=clock.tl.fukuoka-u.ac.jp" },
-      { "Netherlands",		"ntp0.nl.net (GPS clock)",
+	"ntpdate_enable=YES,ntpdate_flags=ntp1.cmc.ec.gc.ca" },
+      { "Canada #3",		"ntp2.cmc.ec.gc.ca",
 	dmenuVarsCheck,	dmenuSetVariables, NULL, 
-	"ntpdate_enable=YES,ntpdate_flags=ntp0.nl.net" },
-      { " Norway",		"timehost.ifi.uio.no (NTP clock)",
+	"ntpdate_enable=YES,ntpdate_flags=ntp2.cmc.ec.gc.ca" },
+      { "Canada #4",		"tick.utoronto.ca",
 	dmenuVarsCheck,	dmenuSetVariables, NULL, 
-	"ntpdate_enable=YES,ntpdate_flags=timehost.ifi.uio.no" },
-      { "Sweden",		"Time1.Stupi.SE (Cesium/GPS)",
+	"ntpdate_enable=YES,ntpdate_flags=tick.utoronto.ca" },
+      { "Canada #5",		"time.chu.nrc.ca",
 	dmenuVarsCheck,	dmenuSetVariables, NULL, 
-	"ntpdate_enable=YES,ntpdate_flags=Time1.Stupi.SE" },
-      { " Switzerland",		"swisstime.ethz.ch (DCF77 clock)",
+	"ntpdate_enable=YES,ntpdate_flags=time.chu.nrc.ca" },
+      { "Canada #6",		"time.nrc.ca",
 	dmenuVarsCheck,	dmenuSetVariables, NULL, 
-	"ntpdate_enable=YES,ntpdate_flags=swisstime.ethz.ch" },
-      { "U.S. East Coast",	"bitsy.mit.edu (WWV clock)",
+	"ntpdate_enable=YES,ntpdate_flags=time.nrc.ca" },
+      { "Canada #7",		"timelord.uregina.ca",
 	dmenuVarsCheck,	dmenuSetVariables, NULL, 
-	"ntpdate_enable=YES,ntpdate_flags=bitsy.mit.edu" },
-      { " U.S. East Coast #2",	"otc1.psu.edu (WWV clock)",
+	"ntpdate_enable=YES,ntpdate_flags=timelord.uregina.ca" },
+      { "Canada #8",		"tock.utoronto.ca",
 	dmenuVarsCheck,	dmenuSetVariables, NULL, 
-	"ntpdate_enable=YES,ntpdate_flags=otc1.psu.edu" },
-      { " U.S. West Coast #1",	"clepsydra.dec.com (GOES clock)",
+	"ntpdate_enable=YES,ntpdate_flags=tock.utoronto.ca" },
+      { "Czech",		"ntp.karpo.cz",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=ntp.karpo.cz" },
+      { "Denmark",		"clock.netcetera.dk",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=clock.netcetera.dk" },
+      { "Denmark",		"clock2.netcetera.dk",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=clock2.netcetera.dk" },
+      { "Spain",		"slug.ctv.es",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=slug.ctv.es" },
+      { "Finland",		"tick.keso.fi",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=tick.keso.fi" },
+      { "Finland #2",		"tock.keso.fi",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=tock.keso.fi" },
+      { "France",		"ntp.obspm.fr",
 	dmenuVarsCheck,	dmenuSetVariables, NULL, 
-	"ntpdate_enable=YES,ntpdate_flags=clepsydra.dec.com" },
-      { " U.S. West Coast #2",	"clock.llnl.gov (WWVB clock)",
+	"ntpdate_enable=YES,ntpdate_flags=ntp.obspm.fr" },
+      { "France #2",		"ntp.univ-lyon1.fr",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=ntp.univ-lyon1.fr" },
+      { "France #3",		"ntp.via.ecp.fr",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=ntp.via.ecp.fr" },
+      { "Croatia",		"zg1.ntp.carnet.hr",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=zg1.ntp.carnet.hr" },
+      { "Croatia #2",		"zg2.ntp.carnet.hr",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=zg2.ntp.carnet.hr" },
+      { "Croatia #3",		"st.ntp.carnet.hr",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=st.ntp.carnet.hr" },
+      { "Croatia #4",		"ri.ntp.carnet.hr",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=ri.ntp.carnet.hr" },
+      { "Croatia #5",		"os.ntp.carnet.hr",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=os.ntp.carnet.hr" },
+      { "Hungary",		"time.kfki.hu",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=time.kfki.hu" },
+      { "Indonesia",		"ntp.incaf.net",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=ntp.incaf.net" },
+      { "Ireland",		"ntp.maths.tcd.ie",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=ntp.maths.tcd.ie" },
+      { "Italy",		"ntps.net4u.it",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=" },
+      { "Japan",		"ntp.cyber-fleet.net",
 	dmenuVarsCheck,	dmenuSetVariables, NULL, 
-	"ntpdate_enable=YES,ntpdate_flags=clock.llnl.gov" },
-      { " U.S. Midwest",		"ncar.ucar.edu (WWVB clock)",
+	"ntpdate_enable=YES,ntpdate_flags=ntp.cyber-fleet.net" },
+      { "Korea",		"time.nuri.net",
 	dmenuVarsCheck,	dmenuSetVariables, NULL, 
-	"ntpdate_enable=YES,ntpdate_flags=ncar.ucar.edu" },
+	"ntpdate_enable=YES,ntpdate_flags=time.nuri.net" },
+      { "Mexico",		"ntp2a.audiotel.com.mx",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=ntp2a.audiotel.com.mx" },
+      { "Mexico #2",		"ntp2b.audiotel.com.mx",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=ntp2b.audiotel.com.mx" },
+      { "Mexico #3",		"ntp2c.audiotel.com.mx",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=ntp2c.audiotel.com.mx" },
+      { "Nigeria",		"ntp.supernet300.com",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=ntp.supernet300.com" },
+      { "Netherlands",		"ntp1.theinternetone.net",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=ntp1.theinternetone.net" },
+      { "Netherlands #2",	"ntp2.theinternetone.net",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=ntp2.theinternetone.net" },
+      { "Netherlands #3",	"ntp3.theinternetone.net",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=ntp3.theinternetone.net" },
+      { "Norway",		"fartein.ifi.uio.no",
+	dmenuVarsCheck,	dmenuSetVariables, NULL, 
+	"ntpdate_enable=YES,ntpdate_flags=fartein.ifi.uio.no" },
+      { "Norway #2",		"time.alcanet.no",
+	dmenuVarsCheck,	dmenuSetVariables, NULL, 
+	"ntpdate_enable=YES,ntpdate_flags=time.alcanet.no" },
+      { "New Zealand",		"ntp.massey.ac.nz",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=ntp.massey.ac.nz" },
+      { "New Zealand #2",	"ntp.public.otago.ac.nz",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=ntp.public.otago.ac.nz" },
+      { "New Zealand #3",	"tk1.ihug.co.nz",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=tk1.ihug.co.nz" },
+      { "New Zealand #4",	"ntp.waikato.ac.nz",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=ntp.waikato.ac.nz" },
+      { "Poland",		"info.cyf-kr.edu.pl",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=info.cyf-kr.edu.pl" },
+      { "Portugal",		"bug.fe.up.pt",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=bug.fe.up.pt" },
+      { "Romania",		"ntp.ip.ro",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=ntp.ip.ro" },
+      { "Russia",		"ntp.psn.ru",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=ntp.psn.ru" },
+      { "Russia #2",		"sign.chg.ru",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=sign.chg.ru" },
+      { "Sweden",		"ntp.lth.se",
+	dmenuVarsCheck,	dmenuSetVariables, NULL, 
+	"ntpdate_enable=YES,ntpdate_flags=ntp.lth.se" },
+      { "Singapore",		"ntp.shim.org",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=ntp.shim.org" },
+      { "Slovenia",		"calvus.rzs-hm.si",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=calvus.rzs-hm.si" },
+      { "Slovenia #2",		"sizif.mf.uni-lj.si",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=sizif.mf.uni-lj.si" },
+      { "Slovenia #3",		"ntp1.arnes.si",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=ntp1.arnes.si" },
+      { "Slovenia #4",		"ntp2.arnes.si",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=ntp2.arnes.si" },
+      { "Slovenia #5",		"time.ijs.si",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=time.ijs.si" },
+      { "Scotland",		"ntp.cs.strath.ac.uk",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=ntp.cs.strath.ac.uk" },
+      { "United Kingdom",	"ntp.exnet.com",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=ntp.exnet.com" },
+      { "United Kingdom #2",	"ntp0.uk.uu.net",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=ntp0.uk.uu.net" },
+      { "United Kingdom #3",	"ntp1.uk.uu.net",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=ntp1.uk.uu.net" },
+      { "United Kingdom #4",	"ntp2.uk.uu.net",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=ntp2.uk.uu.net" },
+      { "United Kingdom #5",	"ntp2a.mcc.ac.uk",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=ntp2a.mcc.ac.uk" },
+      { "United Kingdom #6",	"ntp2b.mcc.ac.uk",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=ntp2b.mcc.ac.uk" },
+      { "United Kingdom #7",	"ntp2c.mcc.ac.uk",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=ntp2c.mcc.ac.uk" },
+      { "United Kingdom #8",	"ntp2d.mcc.ac.uk",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=ntp2d.mcc.ac.uk" },
+      { "United Kingdom #9",	"tick.tanac.net",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=tick.tanac.net" },
+      { "U.S. AR",	"sushi.compsci.lyon.edu",
+	dmenuVarsCheck,	dmenuSetVariables, NULL, 
+	"ntpdate_enable=YES,ntpdate_flags=sushi.compsci.lyon.edu" },
+      { "U.S. AZ",	"ntp.drydog.com",
+	dmenuVarsCheck,	dmenuSetVariables, NULL, 
+	"ntpdate_enable=YES,ntpdate_flags=ntp.drydog.com" },
+      { "U.S. CA",	"ntp.ucsd.edu",
+	dmenuVarsCheck,	dmenuSetVariables, NULL, 
+	"ntpdate_enable=YES,ntpdate_flags=ntp.ucsd.edu" },
+      { "U.S. CA #2",	"ntp1.mainecoon.com",
+	dmenuVarsCheck,	dmenuSetVariables, NULL, 
+	"ntpdate_enable=YES,ntpdate_flags=ntp1.mainecoon.com" },
+      { "U.S. CA #3",	"ntp2.mainecoon.com",
+	dmenuVarsCheck,	dmenuSetVariables, NULL, 
+	"ntpdate_enable=YES,ntpdate_flags=ntp2.mainecoon.com" },
+      { "U.S. CA #4",	"reloj.kjsl.com",
+	dmenuVarsCheck,	dmenuSetVariables, NULL, 
+	"ntpdate_enable=YES,ntpdate_flags=reloj.kjsl.com" },
+      { "U.S. CA #5",	"time.five-ten-sg.com",
+	dmenuVarsCheck,	dmenuSetVariables, NULL, 
+	"ntpdate_enable=YES,ntpdate_flags=time.five-ten-sg.com" },
+      { "U.S. DE",	"louie.udel.edu",
+	dmenuVarsCheck,	dmenuSetVariables, NULL, 
+	"ntpdate_enable=YES,ntpdate_flags=louie.udel.edu" },
+      { "U.S. GA",		"ntp.shorty.com",
+	dmenuVarsCheck,	dmenuSetVariables, NULL, 
+	"ntpdate_enable=YES,ntpdate_flags=ntp.shorty.com" },
+      { "U.S. GA #2",		"rolex.usg.edu",
+	dmenuVarsCheck,	dmenuSetVariables, NULL, 
+	"ntpdate_enable=YES,ntpdate_flags=rolex.usg.edu" },
+      { "U.S. GA #3",		"timex.usg.edu",
+	dmenuVarsCheck,	dmenuSetVariables, NULL, 
+	"ntpdate_enable=YES,ntpdate_flags=timex.usg.edu" },
+      { "U.S. IL",	"ntp-0.cso.uiuc.edu",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=ntp-0.cso.uiuc.edu" },
+      { "U.S. IL #2",	"ntp-1.cso.uiuc.edu",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=ntp-1.cso.uiuc.edu" },
+      { "U.S. IL #3",	"ntp-1.mcs.anl.gov",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=ntp-1.mcs.anl.gov" },
+      { "U.S. IL #4",	"ntp-2.cso.uiuc.edu",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=ntp-2.cso.uiuc.edu" },
+      { "U.S. IL #5",	"ntp-2.mcs.anl.gov",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=ntp-2.mcs.anl.gov" },
+      { "U.S. IN",	"gilbreth.ecn.purdue.edu",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=gilbreth.ecn.purdue.edu" },
+      { "U.S. IN #2",	"harbor.ecn.purdue.edu",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=harbor.ecn.purdue.edu" },
+      { "U.S. IN #3",	"molecule.ecn.purdue.edu",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=molecule.ecn.purdue.edu" },
+      { "U.S. KS",	"ntp1.kansas.net",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=ntp1.kansas.net" },
+      { "U.S. KS #2",	"ntp2.kansas.net",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=ntp2.kansas.net" },
+      { "U.S. MA",	"ntp.ourconcord.net",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=ntp.ourconcord.net" },
+      { "U.S. MA #2",	"timeserver.cs.umb.edu",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=timeserver.cs.umb.edu" },
+      { "U.S. MN",	"ns.nts.umn.edu",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=ns.nts.umn.edu" },
+      { "U.S. MN #2",	"nss.nts.umn.edu",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=nss.nts.umn.edu" },
+      { "U.S. MO",	"time-ext.missouri.edu",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=time-ext.missouri.edu" },
+      { "U.S. MT",	"chronos1.umt.edu",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=chronos1.umt.edu" },
+      { "U.S. MT #2",	"chronos2.umt.edu",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=chronos2.umt.edu" },
+      { "U.S. MT #3",	"chronos3.umt.edu",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=chronos3.umt.edu" },
+      { "U.S. NC",	"clock1.unc.edu",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=clock1.unc.edu" },
+      { "U.S. NV",	"cuckoo.nevada.edu",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=cuckoo.nevada.edu" },
+      { "U.S. NV #2",	"tick.cs.unlv.edu",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=tick.cs.unlv.edu" },
+      { "U.S. NV #3",	"tock.cs.unlv.edu",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=tock.cs.unlv.edu" },
+      { "U.S. NY",	"clock.linuxshell.net",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=clock.linuxshell.net" },
+      { "U.S. NY #2",	"ntp.ctr.columbia.edu",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=ntp.ctr.columbia.edu" },
+      { "U.S. NY #3",	"ntp0.cornell.edu",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=ntp0.cornell.edu" },
+      { "U.S. NY #4",	"ntp1.mpis.net",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=ntp1.mpis.net" },
+      { "U.S. NY #5",	"ntp2.mpis.net",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=ntp2.mpis.net" },
+      { "U.S. NY #6",	"sundial.columbia.edu",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=sundial.columbia.edu" },
+      { "U.S. NY #7",	"timex.cs.columbia.edu",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=timex.cs.columbia.edu" },
+      { "U.S. OK",	"constellation.ecn.uoknor.edu",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=constellation.ecn.uoknor.edu" },
+      { "U.S. PA",	"clock-1.cs.cmu.edu",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=clock-1.cs.cmu.edu" },
+      { "U.S. PA #2",	"clock-2.cs.cmu.edu",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=clock-2.cs.cmu.edu" },
+      { "U.S. PA #3",	"clock.psu.edu",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=clock.psu.edu" },
+      { "U.S. PA #4",	"fuzz.psc.edu",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=fuzz.psc.edu" },
+      { "U.S. PA #5",	"ntp-1.ece.cmu.edu",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=ntp-1.ece.cmu.edu" },
+      { "U.S. PA #6",	"ntp-2.ece.cmu.edu",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=ntp-2.ece.cmu.edu" },
+      { "U.S. TX",	"ntp.cox.smu.edu",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=ntp.cox.smu.edu" },
+      { "U.S. TX #2",	"ntp.fnbhs.com",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=ntp.fnbhs.com" },
+      { "U.S. TX #3",	"ntp.tmc.edu",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=ntp.tmc.edu" },
+      { "U.S. TX #4",	"ntp5.tamu.edu",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=ntp5.tamu.edu" },
+      { "U.S. TX #5",	"tick.greyware.com",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=tick.greyware.com" },
+      { "U.S. TX #6",	"tock.greyware.com",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=tock.greyware.com" },
+      { "U.S. VA",	"ntp-1.vt.edu",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=ntp-1.vt.edu" },
+      { "U.S. VA #2",	"ntp-2.vt.edu",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=ntp-2.vt.edu" },
+      { "U.S. VA #3",	"ntp.cmr.gov",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=ntp.cmr.gov" },
+      { "U.S. VT",	"ntp0.state.vt.us",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=ntp0.state.vt.us" },
+      { "U.S. VT #2",	"ntp1.state.vt.us",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=ntp1.state.vt.us" },
+      { "U.S. VT #3",	"ntp2.state.vt.us",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=ntp2.state.vt.us" },
+      { "U.S. WA",	"clock.tricity.wsu.edu",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=clock.tricity.wsu.edu" },
+      { "U.S. WA #2",	"ntp.tcp-udp.net",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=ntp.tcp-udp.net" },
+      { "U.S. WI",	"ntp1.cs.wisc.edu",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=ntp1.cs.wisc.edu" },
+      { "U.S. WI #2",	"ntp3.cs.wisc.edu",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=ntp3.cs.wisc.edu" },
+      { "Venezuela",	"ntp.linux.org.ve",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=ntp.linux.org.ve" },
+      { "South Africa",	"ntp.cs.unp.ac.za",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=ntp.cs.unp.ac.za" },
       { NULL } },
 };
 
diff --git a/usr.sbin/sysinstall/menus.c b/usr.sbin/sysinstall/menus.c
index ff0ee2e..09b50e6 100644
--- a/usr.sbin/sysinstall/menus.c
+++ b/usr.sbin/sysinstall/menus.c
@@ -1393,54 +1393,432 @@ DMenu MenuNTP = {
 	"ntpdate_enable=NO,ntpdate_flags=none" },
       { "Other",		"Select a site not on this list",
 	dmenuVarsCheck, configNTP, NULL, NULL },
-      { "Australia",		"ntp.nml.csiro.au (HP 5071A Cesium Beam)",
+      { "Argentina",		"tick.nap.com.ar",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=tick.nap.com.ar" },
+      { "Argentina #2",		"time.sinectis.com.ar",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=time.sinectis.com.ar" },
+      { "Argentina #3",		"tock.nap.com.ar",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=tock.nap.com.ar" },
+      { "Australia",		"augean.eleceng.adelaide.edu.au",
 	dmenuVarsCheck,	dmenuSetVariables, NULL, 
-	"ntpdate_enable=YES,ntpdate_flags=ntp.tip.csiro.au" },
-      { " Canada",		"tick.usask.ca (GOES clock)",
+	"ntpdate_enable=YES,ntpdate_flags=augean.eleceng.adelaide.edu.au" },
+      { "Australia #2",		"ntp.adelaide.edu.au",
 	dmenuVarsCheck,	dmenuSetVariables, NULL, 
-	"ntpdate_enable=YES,ntpdate_flags=tick.usask.ca" },
-      { "France",		"canon.inria.fr (TDF clock)",
+	"ntpdate_enable=YES,ntpdate_flags=ntp.adelaide.edu.au" },
+      { "Australia #3",		"ntp.saard.net",
 	dmenuVarsCheck,	dmenuSetVariables, NULL, 
-	"ntpdate_enable=YES,ntpdate_flags=canon.inria.fr" },
-      { "Germany",		"ntps1-{0,1,2}.uni-erlangen.de (GPS)",
+	"ntpdate_enable=YES,ntpdate_flags=ntp.saard.net" },
+      { "Australia #4",		"time.deakin.edu.au",
 	dmenuVarsCheck,	dmenuSetVariables, NULL, 
-	"ntpdate_enable=YES,ntpdate_flags=ntps1-0.uni-erlangen.de" },
-      { " Germany #2",		"ntps1-0.cs.tu-berlin.de (GPS)",
+	"ntpdate_enable=YES,ntpdate_flags=time.deakin.edu.au" },
+      { "Australia #5",		"time.esec.com.au",
 	dmenuVarsCheck,	dmenuSetVariables, NULL, 
-	"ntpdate_enable=YES,ntpdate_flags=ntps1-0.cs.tu-berlin.de" },
-      { "Japan",		"clock.nc.fukuoka-u.ac.jp (GPS clock)",
+	"ntpdate_enable=YES,ntpdate_flags=time.esec.com.au" },
+      { "Belgium",		"ntp1.belbone.be",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=ntp1.belbone.be" },
+      { "Belgium #2",		"ntp2.belbone.be",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=ntp2.belbone.be" },
+      { "Brazil",		"ntp.cais.rnp.br",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=ntp.cais.rnp.br" },
+      { "Brazil #2",		"ntp.pop-df.rnp.br",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=ntp.pop-df.rnp.br" },
+      { "Brazil #3",		"ntp.ufes.br",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=ntp.ufes.br" },
+      { "Brazil #4",		"ntp1.pucpr.br",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=ntp1.pucpr.br" },
+      { "Canada",		"ntp.cpsc.ucalgary.ca",
 	dmenuVarsCheck,	dmenuSetVariables, NULL, 
-	"ntpdate_enable=YES,ntpdate_flags=clock.nc.fukuoka-u.ac.jp" },
-      { " Japan #2",		"clock.tl.fukuoka-u.ac.jp (GPS clock)",
+	"ntpdate_enable=YES,ntpdate_flags=ntp.cpsc.ucalgary.ca" },
+      { "Canada #2",		"ntp1.cmc.ec.gc.ca",
 	dmenuVarsCheck,	dmenuSetVariables, NULL, 
-	"ntpdate_enable=YES,ntpdate_flags=clock.tl.fukuoka-u.ac.jp" },
-      { "Netherlands",		"ntp0.nl.net (GPS clock)",
+	"ntpdate_enable=YES,ntpdate_flags=ntp1.cmc.ec.gc.ca" },
+      { "Canada #3",		"ntp2.cmc.ec.gc.ca",
 	dmenuVarsCheck,	dmenuSetVariables, NULL, 
-	"ntpdate_enable=YES,ntpdate_flags=ntp0.nl.net" },
-      { " Norway",		"timehost.ifi.uio.no (NTP clock)",
+	"ntpdate_enable=YES,ntpdate_flags=ntp2.cmc.ec.gc.ca" },
+      { "Canada #4",		"tick.utoronto.ca",
 	dmenuVarsCheck,	dmenuSetVariables, NULL, 
-	"ntpdate_enable=YES,ntpdate_flags=timehost.ifi.uio.no" },
-      { "Sweden",		"Time1.Stupi.SE (Cesium/GPS)",
+	"ntpdate_enable=YES,ntpdate_flags=tick.utoronto.ca" },
+      { "Canada #5",		"time.chu.nrc.ca",
 	dmenuVarsCheck,	dmenuSetVariables, NULL, 
-	"ntpdate_enable=YES,ntpdate_flags=Time1.Stupi.SE" },
-      { " Switzerland",		"swisstime.ethz.ch (DCF77 clock)",
+	"ntpdate_enable=YES,ntpdate_flags=time.chu.nrc.ca" },
+      { "Canada #6",		"time.nrc.ca",
 	dmenuVarsCheck,	dmenuSetVariables, NULL, 
-	"ntpdate_enable=YES,ntpdate_flags=swisstime.ethz.ch" },
-      { "U.S. East Coast",	"bitsy.mit.edu (WWV clock)",
+	"ntpdate_enable=YES,ntpdate_flags=time.nrc.ca" },
+      { "Canada #7",		"timelord.uregina.ca",
 	dmenuVarsCheck,	dmenuSetVariables, NULL, 
-	"ntpdate_enable=YES,ntpdate_flags=bitsy.mit.edu" },
-      { " U.S. East Coast #2",	"otc1.psu.edu (WWV clock)",
+	"ntpdate_enable=YES,ntpdate_flags=timelord.uregina.ca" },
+      { "Canada #8",		"tock.utoronto.ca",
 	dmenuVarsCheck,	dmenuSetVariables, NULL, 
-	"ntpdate_enable=YES,ntpdate_flags=otc1.psu.edu" },
-      { " U.S. West Coast #1",	"clepsydra.dec.com (GOES clock)",
+	"ntpdate_enable=YES,ntpdate_flags=tock.utoronto.ca" },
+      { "Czech",		"ntp.karpo.cz",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=ntp.karpo.cz" },
+      { "Denmark",		"clock.netcetera.dk",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=clock.netcetera.dk" },
+      { "Denmark",		"clock2.netcetera.dk",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=clock2.netcetera.dk" },
+      { "Spain",		"slug.ctv.es",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=slug.ctv.es" },
+      { "Finland",		"tick.keso.fi",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=tick.keso.fi" },
+      { "Finland #2",		"tock.keso.fi",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=tock.keso.fi" },
+      { "France",		"ntp.obspm.fr",
 	dmenuVarsCheck,	dmenuSetVariables, NULL, 
-	"ntpdate_enable=YES,ntpdate_flags=clepsydra.dec.com" },
-      { " U.S. West Coast #2",	"clock.llnl.gov (WWVB clock)",
+	"ntpdate_enable=YES,ntpdate_flags=ntp.obspm.fr" },
+      { "France #2",		"ntp.univ-lyon1.fr",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=ntp.univ-lyon1.fr" },
+      { "France #3",		"ntp.via.ecp.fr",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=ntp.via.ecp.fr" },
+      { "Croatia",		"zg1.ntp.carnet.hr",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=zg1.ntp.carnet.hr" },
+      { "Croatia #2",		"zg2.ntp.carnet.hr",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=zg2.ntp.carnet.hr" },
+      { "Croatia #3",		"st.ntp.carnet.hr",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=st.ntp.carnet.hr" },
+      { "Croatia #4",		"ri.ntp.carnet.hr",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=ri.ntp.carnet.hr" },
+      { "Croatia #5",		"os.ntp.carnet.hr",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=os.ntp.carnet.hr" },
+      { "Hungary",		"time.kfki.hu",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=time.kfki.hu" },
+      { "Indonesia",		"ntp.incaf.net",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=ntp.incaf.net" },
+      { "Ireland",		"ntp.maths.tcd.ie",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=ntp.maths.tcd.ie" },
+      { "Italy",		"ntps.net4u.it",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=" },
+      { "Japan",		"ntp.cyber-fleet.net",
 	dmenuVarsCheck,	dmenuSetVariables, NULL, 
-	"ntpdate_enable=YES,ntpdate_flags=clock.llnl.gov" },
-      { " U.S. Midwest",		"ncar.ucar.edu (WWVB clock)",
+	"ntpdate_enable=YES,ntpdate_flags=ntp.cyber-fleet.net" },
+      { "Korea",		"time.nuri.net",
 	dmenuVarsCheck,	dmenuSetVariables, NULL, 
-	"ntpdate_enable=YES,ntpdate_flags=ncar.ucar.edu" },
+	"ntpdate_enable=YES,ntpdate_flags=time.nuri.net" },
+      { "Mexico",		"ntp2a.audiotel.com.mx",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=ntp2a.audiotel.com.mx" },
+      { "Mexico #2",		"ntp2b.audiotel.com.mx",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=ntp2b.audiotel.com.mx" },
+      { "Mexico #3",		"ntp2c.audiotel.com.mx",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=ntp2c.audiotel.com.mx" },
+      { "Nigeria",		"ntp.supernet300.com",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=ntp.supernet300.com" },
+      { "Netherlands",		"ntp1.theinternetone.net",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=ntp1.theinternetone.net" },
+      { "Netherlands #2",	"ntp2.theinternetone.net",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=ntp2.theinternetone.net" },
+      { "Netherlands #3",	"ntp3.theinternetone.net",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=ntp3.theinternetone.net" },
+      { "Norway",		"fartein.ifi.uio.no",
+	dmenuVarsCheck,	dmenuSetVariables, NULL, 
+	"ntpdate_enable=YES,ntpdate_flags=fartein.ifi.uio.no" },
+      { "Norway #2",		"time.alcanet.no",
+	dmenuVarsCheck,	dmenuSetVariables, NULL, 
+	"ntpdate_enable=YES,ntpdate_flags=time.alcanet.no" },
+      { "New Zealand",		"ntp.massey.ac.nz",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=ntp.massey.ac.nz" },
+      { "New Zealand #2",	"ntp.public.otago.ac.nz",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=ntp.public.otago.ac.nz" },
+      { "New Zealand #3",	"tk1.ihug.co.nz",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=tk1.ihug.co.nz" },
+      { "New Zealand #4",	"ntp.waikato.ac.nz",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=ntp.waikato.ac.nz" },
+      { "Poland",		"info.cyf-kr.edu.pl",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=info.cyf-kr.edu.pl" },
+      { "Portugal",		"bug.fe.up.pt",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=bug.fe.up.pt" },
+      { "Romania",		"ntp.ip.ro",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=ntp.ip.ro" },
+      { "Russia",		"ntp.psn.ru",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=ntp.psn.ru" },
+      { "Russia #2",		"sign.chg.ru",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=sign.chg.ru" },
+      { "Sweden",		"ntp.lth.se",
+	dmenuVarsCheck,	dmenuSetVariables, NULL, 
+	"ntpdate_enable=YES,ntpdate_flags=ntp.lth.se" },
+      { "Singapore",		"ntp.shim.org",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=ntp.shim.org" },
+      { "Slovenia",		"calvus.rzs-hm.si",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=calvus.rzs-hm.si" },
+      { "Slovenia #2",		"sizif.mf.uni-lj.si",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=sizif.mf.uni-lj.si" },
+      { "Slovenia #3",		"ntp1.arnes.si",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=ntp1.arnes.si" },
+      { "Slovenia #4",		"ntp2.arnes.si",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=ntp2.arnes.si" },
+      { "Slovenia #5",		"time.ijs.si",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=time.ijs.si" },
+      { "Scotland",		"ntp.cs.strath.ac.uk",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=ntp.cs.strath.ac.uk" },
+      { "United Kingdom",	"ntp.exnet.com",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=ntp.exnet.com" },
+      { "United Kingdom #2",	"ntp0.uk.uu.net",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=ntp0.uk.uu.net" },
+      { "United Kingdom #3",	"ntp1.uk.uu.net",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=ntp1.uk.uu.net" },
+      { "United Kingdom #4",	"ntp2.uk.uu.net",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=ntp2.uk.uu.net" },
+      { "United Kingdom #5",	"ntp2a.mcc.ac.uk",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=ntp2a.mcc.ac.uk" },
+      { "United Kingdom #6",	"ntp2b.mcc.ac.uk",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=ntp2b.mcc.ac.uk" },
+      { "United Kingdom #7",	"ntp2c.mcc.ac.uk",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=ntp2c.mcc.ac.uk" },
+      { "United Kingdom #8",	"ntp2d.mcc.ac.uk",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=ntp2d.mcc.ac.uk" },
+      { "United Kingdom #9",	"tick.tanac.net",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=tick.tanac.net" },
+      { "U.S. AR",	"sushi.compsci.lyon.edu",
+	dmenuVarsCheck,	dmenuSetVariables, NULL, 
+	"ntpdate_enable=YES,ntpdate_flags=sushi.compsci.lyon.edu" },
+      { "U.S. AZ",	"ntp.drydog.com",
+	dmenuVarsCheck,	dmenuSetVariables, NULL, 
+	"ntpdate_enable=YES,ntpdate_flags=ntp.drydog.com" },
+      { "U.S. CA",	"ntp.ucsd.edu",
+	dmenuVarsCheck,	dmenuSetVariables, NULL, 
+	"ntpdate_enable=YES,ntpdate_flags=ntp.ucsd.edu" },
+      { "U.S. CA #2",	"ntp1.mainecoon.com",
+	dmenuVarsCheck,	dmenuSetVariables, NULL, 
+	"ntpdate_enable=YES,ntpdate_flags=ntp1.mainecoon.com" },
+      { "U.S. CA #3",	"ntp2.mainecoon.com",
+	dmenuVarsCheck,	dmenuSetVariables, NULL, 
+	"ntpdate_enable=YES,ntpdate_flags=ntp2.mainecoon.com" },
+      { "U.S. CA #4",	"reloj.kjsl.com",
+	dmenuVarsCheck,	dmenuSetVariables, NULL, 
+	"ntpdate_enable=YES,ntpdate_flags=reloj.kjsl.com" },
+      { "U.S. CA #5",	"time.five-ten-sg.com",
+	dmenuVarsCheck,	dmenuSetVariables, NULL, 
+	"ntpdate_enable=YES,ntpdate_flags=time.five-ten-sg.com" },
+      { "U.S. DE",	"louie.udel.edu",
+	dmenuVarsCheck,	dmenuSetVariables, NULL, 
+	"ntpdate_enable=YES,ntpdate_flags=louie.udel.edu" },
+      { "U.S. GA",		"ntp.shorty.com",
+	dmenuVarsCheck,	dmenuSetVariables, NULL, 
+	"ntpdate_enable=YES,ntpdate_flags=ntp.shorty.com" },
+      { "U.S. GA #2",		"rolex.usg.edu",
+	dmenuVarsCheck,	dmenuSetVariables, NULL, 
+	"ntpdate_enable=YES,ntpdate_flags=rolex.usg.edu" },
+      { "U.S. GA #3",		"timex.usg.edu",
+	dmenuVarsCheck,	dmenuSetVariables, NULL, 
+	"ntpdate_enable=YES,ntpdate_flags=timex.usg.edu" },
+      { "U.S. IL",	"ntp-0.cso.uiuc.edu",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=ntp-0.cso.uiuc.edu" },
+      { "U.S. IL #2",	"ntp-1.cso.uiuc.edu",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=ntp-1.cso.uiuc.edu" },
+      { "U.S. IL #3",	"ntp-1.mcs.anl.gov",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=ntp-1.mcs.anl.gov" },
+      { "U.S. IL #4",	"ntp-2.cso.uiuc.edu",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=ntp-2.cso.uiuc.edu" },
+      { "U.S. IL #5",	"ntp-2.mcs.anl.gov",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=ntp-2.mcs.anl.gov" },
+      { "U.S. IN",	"gilbreth.ecn.purdue.edu",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=gilbreth.ecn.purdue.edu" },
+      { "U.S. IN #2",	"harbor.ecn.purdue.edu",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=harbor.ecn.purdue.edu" },
+      { "U.S. IN #3",	"molecule.ecn.purdue.edu",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=molecule.ecn.purdue.edu" },
+      { "U.S. KS",	"ntp1.kansas.net",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=ntp1.kansas.net" },
+      { "U.S. KS #2",	"ntp2.kansas.net",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=ntp2.kansas.net" },
+      { "U.S. MA",	"ntp.ourconcord.net",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=ntp.ourconcord.net" },
+      { "U.S. MA #2",	"timeserver.cs.umb.edu",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=timeserver.cs.umb.edu" },
+      { "U.S. MN",	"ns.nts.umn.edu",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=ns.nts.umn.edu" },
+      { "U.S. MN #2",	"nss.nts.umn.edu",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=nss.nts.umn.edu" },
+      { "U.S. MO",	"time-ext.missouri.edu",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=time-ext.missouri.edu" },
+      { "U.S. MT",	"chronos1.umt.edu",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=chronos1.umt.edu" },
+      { "U.S. MT #2",	"chronos2.umt.edu",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=chronos2.umt.edu" },
+      { "U.S. MT #3",	"chronos3.umt.edu",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=chronos3.umt.edu" },
+      { "U.S. NC",	"clock1.unc.edu",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=clock1.unc.edu" },
+      { "U.S. NV",	"cuckoo.nevada.edu",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=cuckoo.nevada.edu" },
+      { "U.S. NV #2",	"tick.cs.unlv.edu",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=tick.cs.unlv.edu" },
+      { "U.S. NV #3",	"tock.cs.unlv.edu",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=tock.cs.unlv.edu" },
+      { "U.S. NY",	"clock.linuxshell.net",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=clock.linuxshell.net" },
+      { "U.S. NY #2",	"ntp.ctr.columbia.edu",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=ntp.ctr.columbia.edu" },
+      { "U.S. NY #3",	"ntp0.cornell.edu",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=ntp0.cornell.edu" },
+      { "U.S. NY #4",	"ntp1.mpis.net",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=ntp1.mpis.net" },
+      { "U.S. NY #5",	"ntp2.mpis.net",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=ntp2.mpis.net" },
+      { "U.S. NY #6",	"sundial.columbia.edu",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=sundial.columbia.edu" },
+      { "U.S. NY #7",	"timex.cs.columbia.edu",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=timex.cs.columbia.edu" },
+      { "U.S. OK",	"constellation.ecn.uoknor.edu",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=constellation.ecn.uoknor.edu" },
+      { "U.S. PA",	"clock-1.cs.cmu.edu",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=clock-1.cs.cmu.edu" },
+      { "U.S. PA #2",	"clock-2.cs.cmu.edu",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=clock-2.cs.cmu.edu" },
+      { "U.S. PA #3",	"clock.psu.edu",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=clock.psu.edu" },
+      { "U.S. PA #4",	"fuzz.psc.edu",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=fuzz.psc.edu" },
+      { "U.S. PA #5",	"ntp-1.ece.cmu.edu",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=ntp-1.ece.cmu.edu" },
+      { "U.S. PA #6",	"ntp-2.ece.cmu.edu",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=ntp-2.ece.cmu.edu" },
+      { "U.S. TX",	"ntp.cox.smu.edu",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=ntp.cox.smu.edu" },
+      { "U.S. TX #2",	"ntp.fnbhs.com",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=ntp.fnbhs.com" },
+      { "U.S. TX #3",	"ntp.tmc.edu",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=ntp.tmc.edu" },
+      { "U.S. TX #4",	"ntp5.tamu.edu",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=ntp5.tamu.edu" },
+      { "U.S. TX #5",	"tick.greyware.com",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=tick.greyware.com" },
+      { "U.S. TX #6",	"tock.greyware.com",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=tock.greyware.com" },
+      { "U.S. VA",	"ntp-1.vt.edu",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=ntp-1.vt.edu" },
+      { "U.S. VA #2",	"ntp-2.vt.edu",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=ntp-2.vt.edu" },
+      { "U.S. VA #3",	"ntp.cmr.gov",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=ntp.cmr.gov" },
+      { "U.S. VT",	"ntp0.state.vt.us",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=ntp0.state.vt.us" },
+      { "U.S. VT #2",	"ntp1.state.vt.us",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=ntp1.state.vt.us" },
+      { "U.S. VT #3",	"ntp2.state.vt.us",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=ntp2.state.vt.us" },
+      { "U.S. WA",	"clock.tricity.wsu.edu",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=clock.tricity.wsu.edu" },
+      { "U.S. WA #2",	"ntp.tcp-udp.net",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=ntp.tcp-udp.net" },
+      { "U.S. WI",	"ntp1.cs.wisc.edu",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=ntp1.cs.wisc.edu" },
+      { "U.S. WI #2",	"ntp3.cs.wisc.edu",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=ntp3.cs.wisc.edu" },
+      { "Venezuela",	"ntp.linux.org.ve",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=ntp.linux.org.ve" },
+      { "South Africa",	"ntp.cs.unp.ac.za",
+	dmenuVarsCheck, dmenuSetVariables, NULL,
+	"ntpdate_enable=YES,ntpdate_flags=ntp.cs.unp.ac.za" },
       { NULL } },
 };