--- a/tld.conf	Mon Dec 04 21:49:09 2006 -0800
+++ b/tld.conf	Tue Jan 30 16:27:49 2007 -0800
@@ -1,8 +1,9 @@
 #
-# icann tlds from http://www.icann.org/registries/listing.html as of 2005-12-24
+# icann tlds from http://www.icann.org/registries/listing.html as of 2006-12-12
 #
 aero
 biz
+cat
 com
 coop
 edu
@@ -11,26 +12,22 @@
 int
 jobs
 mil
+mobi
 museum
 name
 net
 org
 pro
+tel
 travel
 
 #
-# more icann tlds from http://www.icann.org/registrars/accredited-list.html as of 2005-12-24
+# extra country codes that are in the root as of 2006-12-12
 #
-cat
-mobi
+tp  # East Timor, obsolete
 
 #
-# not yet listed by icann or iana, but exist anyway as of 2005-12-24
-#
-su
-
-#
-# iana root tlds from http://www.iana.org/cctld/cctld-whois.htm as of 2005-12-24
+# iana root tlds from http://www.iana.org/cctld/cctld-whois.htm as of 2006-12-12
 #
 ac  # Ascension Island
 ad  # Andorra
@@ -82,7 +79,6 @@
 cn  # China
 co  # Colombia
 cr  # Costa Rica
-cs  # Serbia and Montenegro
 cu  # Cuba
 cv  # Cape Verde
 cx  # Christmas Island
@@ -105,7 +101,7 @@
 fi  # Finland
 fj  # Fiji
 fk  # Falkland Islands (Malvinas)
-fm  # Micronesia, Federal State of
+fm  # Micronesia, Federated States of
 fo  # Faroe Islands
 fr  # France
 ga  # Gabon
@@ -172,13 +168,14 @@
 ma  # Morocco
 mc  # Monaco
 md  # Moldova, Republic of
+me  # Montenegro
 mg  # Madagascar
 mh  # Marshall Islands
 mk  # Macedonia, The Former Yugoslav Republic of
 ml  # Mali
 mm  # Myanmar
 mn  # Mongolia
-mo  # Macau
+mo  # Macao
 mp  # Northern Mariana Islands
 mq  # Martinique
 mr  # Mauritania
@@ -213,13 +210,14 @@
 pm  # Saint Pierre and Miquelon
 pn  # Pitcairn Island
 pr  # Puerto Rico
-ps  # Palestinian Territories
+ps  # Palestinian Territory, Occupied
 pt  # Portugal
 pw  # Palau
 py  # Paraguay
 qa  # Qatar
 re  # Reunion Island
 ro  # Romania
+rs  # Serbia
 ru  # Russian Federation
 rw  # Rwanda
 sa  # Saudi Arabia
@@ -238,6 +236,7 @@
 so  # Somalia
 sr  # Suriname
 st  # Sao Tome and Principe
+su  # Soviet Union (being phased out)
 sv  # El Salvador
 sy  # Syrian Arab Republic
 sz  # Swaziland
@@ -273,7 +272,7 @@
 vn  # Vietnam
 vu  # Vanuatu
 wf  # Wallis and Futuna Islands
-ws  # Western Samoa
+ws  # Samoa
 ye  # Yemen
 yt  # Mayotte
 yu  # Yugoslavia