diff --git a/conf/vanilla/autoload_configs/abstraction.conf.xml b/conf/vanilla/autoload_configs/abstraction.conf.xml
index d4b1dfd274..7244681374 100644
--- a/conf/vanilla/autoload_configs/abstraction.conf.xml
+++ b/conf/vanilla/autoload_configs/abstraction.conf.xml
@@ -1,5 +1,5 @@
 <configuration name="abstraction.conf" description="Abstraction">
 <apis>
-	<api name="user_name" description="Return Name for extension" syntax="<exten>" parse="(.*)" destination="user_data" argument="$1@default var effective_caller_id_name"/>
+	<api name="user_name" description="Return Name for extension" syntax="&lt;exten&gt;" parse="(.*)" destination="user_data" argument="$1@default var effective_caller_id_name"/>
 </apis>
 </configuration>
diff --git a/conf/vanilla/autoload_configs/cidlookup.conf.xml b/conf/vanilla/autoload_configs/cidlookup.conf.xml
index a30f9f5c10..fd28f9b0c0 100644
--- a/conf/vanilla/autoload_configs/cidlookup.conf.xml
+++ b/conf/vanilla/autoload_configs/cidlookup.conf.xml
@@ -1,7 +1,7 @@
 <configuration name="cidlookup.conf" description="cidlookup Configuration">
   <settings>
     <!-- comment out url to not setup a url based lookup -->
-    <param name="url" value="http://query.voipcnam.com/query.php?api_key=MYAPIKEY&number=${caller_id_number}"/>
+    <param name="url" value="http://query.voipcnam.com/query.php?api_key=MYAPIKEY&amp;number=${caller_id_number}"/>
 
     <!-- comment out whitepages-apikey to not use whitepages.com, you must
          get an API key from http://developer.whitepages.com/ -->
diff --git a/conf/vanilla/autoload_configs/timezones.conf.xml b/conf/vanilla/autoload_configs/timezones.conf.xml
index 757d16c19d..50bd7f3760 100644
--- a/conf/vanilla/autoload_configs/timezones.conf.xml
+++ b/conf/vanilla/autoload_configs/timezones.conf.xml
@@ -13,7 +13,7 @@
 	<zone name="Africa/Blantyre" value="CAT-2" />
 	<zone name="Africa/Brazzaville" value="WAT-1" />
 	<zone name="Africa/Bujumbura" value="CAT-2" />
-	<zone name="Africa/Cairo" value="EEST" />
+	<zone name="Africa/Cairo" value="EET-2" />
 	<zone name="Africa/Casablanca" value="WET0WEST,M3.5.0,M10.5.0/3" />
 	<zone name="Africa/Ceuta" value="CET-1CEST,M3.5.0,M10.5.0/3" />
 	<zone name="Africa/Conakry" value="GMT0" />
@@ -55,7 +55,7 @@
 	<zone name="Africa/Tunis" value="CET-1" />
 	<zone name="Africa/Windhoek" value="WAT-1WAST,M9.1.0,M4.1.0" />
 
-	<zone name="America/Adak" value="HAST10HADT,M3.2.0,M11.1.0" />
+	<zone name="America/Adak" value="HST10HDT,M3.2.0,M11.1.0" />
 	<zone name="America/Anchorage" value="AKST9AKDT,M3.2.0,M11.1.0" />
 	<zone name="America/Anguilla" value="AST4" />
 	<zone name="America/Antigua" value="AST4" />
@@ -76,7 +76,7 @@
 	<zone name="America/Aruba" value="AST4" />
 	<zone name="America/Asuncion" value="PYT4PYST,M10.1.0/0,M3.4.0/0" />
 	<zone name="America/Atikokan" value="EST5" />
-	<zone name="America/Atka" value="HAST10HADT,M3.2.0,M11.1.0" />
+	<zone name="America/Atka" value="HST10HDT,M3.2.0,M11.1.0" />
 	<zone name="America/Bahia" value="BRT3" />
 	<zone name="America/Bahia_Banderas" value="CST6CDT,M4.1.0,M10.5.0" />
 	<zone name="America/Barbados" value="AST4" />
@@ -89,11 +89,11 @@
 	<zone name="America/Buenos_Aires" value="ART3" />
 	<zone name="America/Cambridge_Bay" value="MST7MDT,M3.2.0,M11.1.0" />
 	<zone name="America/Campo_Grande" value="AMT4AMST,M10.3.0/0,M2.3.0/0" />
-	<zone name="America/Cancun" value="CST6CDT,M4.1.0,M10.5.0" />
+	<zone name="America/Cancun" value="EST5" />
 	<zone name="America/Caracas" value="VET4:30" />
 	<zone name="America/Catamarca" value="ART3" />
 	<zone name="America/Cayenne" value="GFT3" />
-	<zone name="America/Cayman" value="EST5" />
+	<zone name="America/Cayman" value="EST5EDT,M3.2.0,M11.1.0" />
 	<zone name="America/Chicago" value="CST6CDT,M3.2.0,M11.1.0" />
 	<zone name="America/Chihuahua" value="MST7MDT,M4.1.0,M10.5.0" />
 	<zone name="America/Coral_Harbour" value="EST5" />
@@ -112,12 +112,13 @@
 	<zone name="America/Eirunepe" value="ACT5" />
 	<zone name="America/El_Salvador" value="CST6" />
 	<zone name="America/Ensenada" value="PST8PDT,M3.2.0,M11.1.0" />
+	<zone name="America/Fort_Nelson" value="MST7" />
 	<zone name="America/Fort_Wayne" value="EST5EDT,M3.2.0,M11.1.0" />
 	<zone name="America/Fortaleza" value="BRT3" />
 	<zone name="America/Glace_Bay" value="AST4ADT,M3.2.0,M11.1.0" />
 	<zone name="America/Godthab" value="WGST" />
 	<zone name="America/Goose_Bay" value="AST4ADT,M3.2.0,M11.1.0" />
-	<zone name="America/Grand_Turk" value="EST5EDT,M3.2.0,M11.1.0" />
+	<zone name="America/Grand_Turk" value="AST4" />
 	<zone name="America/Grenada" value="AST4" />
 	<zone name="America/Guadeloupe" value="AST4" />
 	<zone name="America/Guatemala" value="CST6" />
@@ -159,12 +160,12 @@
 	<zone name="America/Mendoza" value="ART3" />
 	<zone name="America/Menominee" value="CST6CDT,M3.2.0,M11.1.0" />
 	<zone name="America/Merida" value="CST6CDT,M4.1.0,M10.5.0" />
-	<zone name="America/Metlakatla" value="MeST8" />
+	<zone name="America/Metlakatla" value="PST8" />
 	<zone name="America/Mexico_City" value="CST6CDT,M4.1.0,M10.5.0" />
 	<zone name="America/Miquelon" value="PMST3PMDT,M3.2.0,M11.1.0" />
 	<zone name="America/Moncton" value="AST4ADT,M3.2.0,M11.1.0" />
 	<zone name="America/Monterrey" value="CST6CDT,M4.1.0,M10.5.0" />
-	<zone name="America/Montevideo" value="UYT3UYST,M10.1.0,M3.2.0" />
+	<zone name="America/Montevideo" value="UYT3" />
 	<zone name="America/Montreal" value="EST5EDT,M3.2.0,M11.1.0" />
 	<zone name="America/Montserrat" value="AST4" />
 	<zone name="America/Nassau" value="EST5EDT,M3.2.0,M11.1.0" />
@@ -194,7 +195,7 @@
 	<zone name="America/Rosario" value="ART3" />
 	<zone name="America/Santa_Isabel" value="PST8PDT,M4.1.0,M10.5.0" />
 	<zone name="America/Santarem" value="BRT3" />
-	<zone name="America/Santiago" value="CLST" />
+	<zone name="America/Santiago" value="CLT3" />
 	<zone name="America/Santo_Domingo" value="AST4" />
 	<zone name="America/Sao_Paulo" value="BRT3BRST,M10.3.0/0,M2.3.0/0" />
 	<zone name="America/Scoresbysund" value="EGT1EGST,M3.5.0/0,M10.5.0/1" />
@@ -220,13 +221,13 @@
 	<zone name="America/Yakutat" value="AKST9AKDT,M3.2.0,M11.1.0" />
 	<zone name="America/Yellowknife" value="MST7MDT,M3.2.0,M11.1.0" />
 
-	<zone name="Antarctica/Casey" value="WST-8" />
+	<zone name="Antarctica/Casey" value="AWST-8" />
 	<zone name="Antarctica/Davis" value="DAVT-7" />
 	<zone name="Antarctica/DumontDUrville" value="DDUT-10" />
 	<zone name="Antarctica/Macquarie" value="MIST-11" />
 	<zone name="Antarctica/Mawson" value="MAWT-5" />
 	<zone name="Antarctica/McMurdo" value="NZST-12NZDT,M9.5.0,M4.1.0/3" />
-	<zone name="Antarctica/Palmer" value="CLST" />
+	<zone name="Antarctica/Palmer" value="CLT3" />
 	<zone name="Antarctica/Rothera" value="ROTT3" />
 	<zone name="Antarctica/South_Pole" value="NZST-12NZDT,M9.5.0,M4.1.0/3" />
 	<zone name="Antarctica/Syowa" value="SYOT-3" />
@@ -251,7 +252,8 @@
 	<zone name="Asia/Bishkek" value="KGT-6" />
 	<zone name="Asia/Brunei" value="BNT-8" />
 	<zone name="Asia/Calcutta" value="IST-5:30" />
-	<zone name="Asia/Choibalsan" value="CHOT-8" />
+	<zone name="Asia/Chita" value="IRKT-8" />
+	<zone name="Asia/Choibalsan" value="CHOT-8CHOST,M3.5.6,M9.5.6/0" />
 	<zone name="Asia/Chongqing" value="CST-8" />
 	<zone name="Asia/Chungking" value="CST-8" />
 	<zone name="Asia/Colombo" value="IST-5:30" />
@@ -266,8 +268,8 @@
 	<zone name="Asia/Hebron" value="EEST" />
 	<zone name="Asia/Ho_Chi_Minh" value="ICT-7" />
 	<zone name="Asia/Hong_Kong" value="HKT-8" />
-	<zone name="Asia/Hovd" value="HOVT-7" />
-	<zone name="Asia/Irkutsk" value="IRKT-9" />
+	<zone name="Asia/Hovd" value="HOVT-7HOVST,M3.5.6,M9.5.6/0" />
+	<zone name="Asia/Irkutsk" value="IRKT-8" />
 	<zone name="Asia/Istanbul" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
 	<zone name="Asia/Jakarta" value="WIB-7" />
 	<zone name="Asia/Jayapura" value="WIT-9" />
@@ -275,39 +277,40 @@
 	<zone name="Asia/Kabul" value="AFT-4:30" />
 	<zone name="Asia/Kamchatka" value="PETT-12" />
 	<zone name="Asia/Karachi" value="PKT-5" />
-	<zone name="Asia/Kashgar" value="CST-8" />
+	<zone name="Asia/Kashgar" value="XJT-6" />
 	<zone name="Asia/Kathmandu" value="NPT-5:45" />
 	<zone name="Asia/Katmandu" value="NPT-5:45" />
-	<zone name="Asia/Khandyga" value="YAKT-10" />
+	<zone name="Asia/Khandyga" value="YAKT-9" />
 	<zone name="Asia/Kolkata" value="IST-5:30" />
-	<zone name="Asia/Krasnoyarsk" value="KRAT-8" />
+	<zone name="Asia/Krasnoyarsk" value="KRAT-7" />
 	<zone name="Asia/Kuala_Lumpur" value="MYT-8" />
 	<zone name="Asia/Kuching" value="MYT-8" />
 	<zone name="Asia/Kuwait" value="AST-3" />
 	<zone name="Asia/Macao" value="CST-8" />
 	<zone name="Asia/Macau" value="CST-8" />
-	<zone name="Asia/Magadan" value="MAGT-12" />
+	<zone name="Asia/Magadan" value="MAGT-10" />
 	<zone name="Asia/Makassar" value="WITA-8" />
 	<zone name="Asia/Manila" value="PHT-8" />
 	<zone name="Asia/Muscat" value="GST-4" />
 	<zone name="Asia/Nicosia" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="Asia/Novokuznetsk" value="NOVT-7" />
-	<zone name="Asia/Novosibirsk" value="NOVT-7" />
-	<zone name="Asia/Omsk" value="OMST-7" />
+	<zone name="Asia/Novokuznetsk" value="KRAT-7" />
+	<zone name="Asia/Novosibirsk" value="NOVT-6" />
+	<zone name="Asia/Omsk" value="OMST-6" />
 	<zone name="Asia/Oral" value="ORAT-5" />
 	<zone name="Asia/Phnom_Penh" value="ICT-7" />
 	<zone name="Asia/Pontianak" value="WIB-7" />
-	<zone name="Asia/Pyongyang" value="KST-9" />
+	<zone name="Asia/Pyongyang" value="KST-8:30" />
 	<zone name="Asia/Qatar" value="AST-3" />
 	<zone name="Asia/Qyzylorda" value="QYZT-6" />
 	<zone name="Asia/Rangoon" value="MMT-6:30" />
 	<zone name="Asia/Riyadh" value="AST-3" />
 	<zone name="Asia/Saigon" value="ICT-7" />
-	<zone name="Asia/Sakhalin" value="SAKT-11" />
+	<zone name="Asia/Sakhalin" value="SAKT-10" />
 	<zone name="Asia/Samarkand" value="UZT-5" />
 	<zone name="Asia/Seoul" value="KST-9" />
 	<zone name="Asia/Shanghai" value="CST-8" />
 	<zone name="Asia/Singapore" value="SGT-8" />
+	<zone name="Asia/Srednekolymsk" value="SRET-11" />
 	<zone name="Asia/Taipei" value="CST-8" />
 	<zone name="Asia/Tashkent" value="UZT-5" />
 	<zone name="Asia/Tbilisi" value="GET-4" />
@@ -317,14 +320,14 @@
 	<zone name="Asia/Thimphu" value="BTT-6" />
 	<zone name="Asia/Tokyo" value="JST-9" />
 	<zone name="Asia/Ujung_Pandang" value="WITA-8" />
-	<zone name="Asia/Ulaanbaatar" value="ULAT-8" />
-	<zone name="Asia/Ulan_Bator" value="ULAT-8" />
-	<zone name="Asia/Urumqi" value="CST-8" />
-	<zone name="Asia/Ust-Nera" value="VLAT-11" />
+	<zone name="Asia/Ulaanbaatar" value="ULAT-8ULAST,M3.5.6,M9.5.6/0" />
+	<zone name="Asia/Ulan_Bator" value="ULAT-8ULAST,M3.5.6,M9.5.6/0" />
+	<zone name="Asia/Urumqi" value="XJT-6" />
+	<zone name="Asia/Ust-Nera" value="VLAT-10" />
 	<zone name="Asia/Vientiane" value="ICT-7" />
-	<zone name="Asia/Vladivostok" value="VLAT-11" />
-	<zone name="Asia/Yakutsk" value="YAKT-10" />
-	<zone name="Asia/Yekaterinburg" value="YEKT-6" />
+	<zone name="Asia/Vladivostok" value="VLAT-10" />
+	<zone name="Asia/Yakutsk" value="YAKT-9" />
+	<zone name="Asia/Yekaterinburg" value="YEKT-5" />
 	<zone name="Asia/Yerevan" value="AMT-4" />
 
 	<zone name="Atlantic/Azores" value="AZOT1AZOST,M3.5.0/0,M10.5.0/1" />
@@ -340,29 +343,29 @@
 	<zone name="Atlantic/St_Helena" value="GMT0" />
 	<zone name="Atlantic/Stanley" value="FKST3" />
 
-	<zone name="Australia/ACT" value="EST-10EST,M10.1.0,M4.1.0/3" />
-	<zone name="Australia/Adelaide" value="CST-9:30CST,M10.1.0,M4.1.0/3" />
-	<zone name="Australia/Brisbane" value="EST-10" />
-	<zone name="Australia/Broken_Hill" value="CST-9:30CST,M10.1.0,M4.1.0/3" />
-	<zone name="Australia/Canberra" value="EST-10EST,M10.1.0,M4.1.0/3" />
-	<zone name="Australia/Currie" value="EST-10EST,M10.1.0,M4.1.0/3" />
-	<zone name="Australia/Darwin" value="CST-9:30" />
-	<zone name="Australia/Eucla" value="CWST-8:45" />
-	<zone name="Australia/Hobart" value="EST-10EST,M10.1.0,M4.1.0/3" />
-	<zone name="Australia/LHI" value="LHST-10:30LHST-11,M10.1.0,M4.1.0" />
-	<zone name="Australia/Lindeman" value="EST-10" />
-	<zone name="Australia/Lord_Howe" value="LHST-10:30LHST-11,M10.1.0,M4.1.0" />
-	<zone name="Australia/Melbourne" value="EST-10EST,M10.1.0,M4.1.0/3" />
-	<zone name="Australia/NSW" value="EST-10EST,M10.1.0,M4.1.0/3" />
-	<zone name="Australia/North" value="CST-9:30" />
-	<zone name="Australia/Perth" value="WST-8" />
-	<zone name="Australia/Queensland" value="EST-10" />
-	<zone name="Australia/South" value="CST-9:30CST,M10.1.0,M4.1.0/3" />
-	<zone name="Australia/Sydney" value="EST-10EST,M10.1.0,M4.1.0/3" />
-	<zone name="Australia/Tasmania" value="EST-10EST,M10.1.0,M4.1.0/3" />
-	<zone name="Australia/Victoria" value="EST-10EST,M10.1.0,M4.1.0/3" />
-	<zone name="Australia/West" value="WST-8" />
-	<zone name="Australia/Yancowinna" value="CST-9:30CST,M10.1.0,M4.1.0/3" />
+	<zone name="Australia/ACT" value="AEST-10AEDT,M10.1.0,M4.1.0/3" />
+	<zone name="Australia/Adelaide" value="ACST-9:30ACDT,M10.1.0,M4.1.0/3" />
+	<zone name="Australia/Brisbane" value="AEST-10" />
+	<zone name="Australia/Broken_Hill" value="ACST-9:30ACDT,M10.1.0,M4.1.0/3" />
+	<zone name="Australia/Canberra" value="AEST-10AEDT,M10.1.0,M4.1.0/3" />
+	<zone name="Australia/Currie" value="AEST-10AEDT,M10.1.0,M4.1.0/3" />
+	<zone name="Australia/Darwin" value="ACST-9:30" />
+	<zone name="Australia/Eucla" value="ACWST-8:45" />
+	<zone name="Australia/Hobart" value="AEST-10AEDT,M10.1.0,M4.1.0/3" />
+	<zone name="Australia/LHI" value="LHST-10:30LHDT-11,M10.1.0,M4.1.0" />
+	<zone name="Australia/Lindeman" value="AEST-10" />
+	<zone name="Australia/Lord_Howe" value="LHST-10:30LHDT-11,M10.1.0,M4.1.0" />
+	<zone name="Australia/Melbourne" value="AEST-10AEDT,M10.1.0,M4.1.0/3" />
+	<zone name="Australia/NSW" value="AEST-10AEDT,M10.1.0,M4.1.0/3" />
+	<zone name="Australia/North" value="ACST-9:30" />
+	<zone name="Australia/Perth" value="AWST-8" />
+	<zone name="Australia/Queensland" value="AEST-10" />
+	<zone name="Australia/South" value="ACST-9:30ACDT,M10.1.0,M4.1.0/3" />
+	<zone name="Australia/Sydney" value="AEST-10AEDT,M10.1.0,M4.1.0/3" />
+	<zone name="Australia/Tasmania" value="AEST-10AEDT,M10.1.0,M4.1.0/3" />
+	<zone name="Australia/Victoria" value="AEST-10AEDT,M10.1.0,M4.1.0/3" />
+	<zone name="Australia/West" value="AWST-8" />
+	<zone name="Australia/Yancowinna" value="ACST-9:30ACDT,M10.1.0,M4.1.0/3" />
 
 	<zone name="Brazil/Acre" value="ACT5" />
 	<zone name="Brazil/DeNoronha" value="FNT2" />
@@ -383,8 +386,8 @@
 	<zone name="Canada/Saskatchewan" value="CST6" />
 	<zone name="Canada/Yukon" value="PST8PDT,M3.2.0,M11.1.0" />
 
-	<zone name="Chile/Continental" value="CLST" />
-	<zone name="Chile/EasterIsland" value="EASST" />
+	<zone name="Chile/Continental" value="CLT3" />
+	<zone name="Chile/EasterIsland" value="EAST5" />
 
 	<zone name="Cuba" value="CST5CDT,M3.2.0/0,M11.1.0/1" />
 
@@ -394,39 +397,39 @@
 
 	<zone name="EST5EDT" value="EST5EDT,M3.2.0,M11.1.0" />
 
-	<zone name="Egypt" value="EEST" />
+	<zone name="Egypt" value="EET-2" />
 
 	<zone name="Eire" value="GMT0IST,M3.5.0/1,M10.5.0" />
 
 	<zone name="Etc/GMT" value="GMT0" />
 	<zone name="Etc/GMT+0" value="GMT0" />
-	<zone name="Etc/GMT+1" value="<GMT+1>1" />
-	<zone name="Etc/GMT+10" value="<GMT+10>10" />
-	<zone name="Etc/GMT+11" value="<GMT+11>11" />
-	<zone name="Etc/GMT+12" value="<GMT+12>12" />
-	<zone name="Etc/GMT+2" value="<GMT+2>2" />
-	<zone name="Etc/GMT+3" value="<GMT+3>3" />
-	<zone name="Etc/GMT+4" value="<GMT+4>4" />
-	<zone name="Etc/GMT+5" value="<GMT+5>5" />
-	<zone name="Etc/GMT+6" value="<GMT+6>6" />
-	<zone name="Etc/GMT+7" value="<GMT+7>7" />
-	<zone name="Etc/GMT+8" value="<GMT+8>8" />
-	<zone name="Etc/GMT+9" value="<GMT+9>9" />
+	<zone name="Etc/GMT+1" value="&lt;GMT+1&gt;1" />
+	<zone name="Etc/GMT+10" value="&lt;GMT+10&gt;10" />
+	<zone name="Etc/GMT+11" value="&lt;GMT+11&gt;11" />
+	<zone name="Etc/GMT+12" value="&lt;GMT+12&gt;12" />
+	<zone name="Etc/GMT+2" value="&lt;GMT+2&gt;2" />
+	<zone name="Etc/GMT+3" value="&lt;GMT+3&gt;3" />
+	<zone name="Etc/GMT+4" value="&lt;GMT+4&gt;4" />
+	<zone name="Etc/GMT+5" value="&lt;GMT+5&gt;5" />
+	<zone name="Etc/GMT+6" value="&lt;GMT+6&gt;6" />
+	<zone name="Etc/GMT+7" value="&lt;GMT+7&gt;7" />
+	<zone name="Etc/GMT+8" value="&lt;GMT+8&gt;8" />
+	<zone name="Etc/GMT+9" value="&lt;GMT+9&gt;9" />
 	<zone name="Etc/GMT-0" value="GMT0" />
-	<zone name="Etc/GMT-1" value="<GMT-1>-1" />
-	<zone name="Etc/GMT-10" value="<GMT-10>-10" />
-	<zone name="Etc/GMT-11" value="<GMT-11>-11" />
-	<zone name="Etc/GMT-12" value="<GMT-12>-12" />
-	<zone name="Etc/GMT-13" value="<GMT-13>-13" />
-	<zone name="Etc/GMT-14" value="<GMT-14>-14" />
-	<zone name="Etc/GMT-2" value="<GMT-2>-2" />
-	<zone name="Etc/GMT-3" value="<GMT-3>-3" />
-	<zone name="Etc/GMT-4" value="<GMT-4>-4" />
-	<zone name="Etc/GMT-5" value="<GMT-5>-5" />
-	<zone name="Etc/GMT-6" value="<GMT-6>-6" />
-	<zone name="Etc/GMT-7" value="<GMT-7>-7" />
-	<zone name="Etc/GMT-8" value="<GMT-8>-8" />
-	<zone name="Etc/GMT-9" value="<GMT-9>-9" />
+	<zone name="Etc/GMT-1" value="&lt;GMT-1&gt;-1" />
+	<zone name="Etc/GMT-10" value="&lt;GMT-10&gt;-10" />
+	<zone name="Etc/GMT-11" value="&lt;GMT-11&gt;-11" />
+	<zone name="Etc/GMT-12" value="&lt;GMT-12&gt;-12" />
+	<zone name="Etc/GMT-13" value="&lt;GMT-13&gt;-13" />
+	<zone name="Etc/GMT-14" value="&lt;GMT-14&gt;-14" />
+	<zone name="Etc/GMT-2" value="&lt;GMT-2&gt;-2" />
+	<zone name="Etc/GMT-3" value="&lt;GMT-3&gt;-3" />
+	<zone name="Etc/GMT-4" value="&lt;GMT-4&gt;-4" />
+	<zone name="Etc/GMT-5" value="&lt;GMT-5&gt;-5" />
+	<zone name="Etc/GMT-6" value="&lt;GMT-6&gt;-6" />
+	<zone name="Etc/GMT-7" value="&lt;GMT-7&gt;-7" />
+	<zone name="Etc/GMT-8" value="&lt;GMT-8&gt;-8" />
+	<zone name="Etc/GMT-9" value="&lt;GMT-9&gt;-9" />
 	<zone name="Etc/GMT0" value="GMT0" />
 	<zone name="Etc/Greenwich" value="GMT0" />
 	<zone name="Etc/UCT" value="UCT0" />
@@ -445,7 +448,7 @@
 	<zone name="Europe/Bucharest" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
 	<zone name="Europe/Budapest" value="CET-1CEST,M3.5.0,M10.5.0/3" />
 	<zone name="Europe/Busingen" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Chisinau" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
+	<zone name="Europe/Chisinau" value="EET-2EEST,M3.5.0,M10.5.0/3" />
 	<zone name="Europe/Copenhagen" value="CET-1CEST,M3.5.0,M10.5.0/3" />
 	<zone name="Europe/Dublin" value="GMT0IST,M3.5.0/1,M10.5.0" />
 	<zone name="Europe/Gibraltar" value="CET-1CEST,M3.5.0,M10.5.0/3" />
@@ -454,7 +457,7 @@
 	<zone name="Europe/Isle_of_Man" value="GMT0BST,M3.5.0/1,M10.5.0" />
 	<zone name="Europe/Istanbul" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
 	<zone name="Europe/Jersey" value="GMT0BST,M3.5.0/1,M10.5.0" />
-	<zone name="Europe/Kaliningrad" value="FET-3" />
+	<zone name="Europe/Kaliningrad" value="EET-2" />
 	<zone name="Europe/Kiev" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
 	<zone name="Europe/Lisbon" value="WET0WEST,M3.5.0/1,M10.5.0" />
 	<zone name="Europe/Ljubljana" value="CET-1CEST,M3.5.0,M10.5.0/3" />
@@ -463,9 +466,9 @@
 	<zone name="Europe/Madrid" value="CET-1CEST,M3.5.0,M10.5.0/3" />
 	<zone name="Europe/Malta" value="CET-1CEST,M3.5.0,M10.5.0/3" />
 	<zone name="Europe/Mariehamn" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="Europe/Minsk" value="FET-3" />
+	<zone name="Europe/Minsk" value="MSK-3" />
 	<zone name="Europe/Monaco" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Moscow" value="MSK-4" />
+	<zone name="Europe/Moscow" value="MSK-3" />
 	<zone name="Europe/Nicosia" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
 	<zone name="Europe/Oslo" value="CET-1CEST,M3.5.0,M10.5.0/3" />
 	<zone name="Europe/Paris" value="CET-1CEST,M3.5.0,M10.5.0/3" />
@@ -476,26 +479,24 @@
 	<zone name="Europe/Samara" value="SAMT-4" />
 	<zone name="Europe/San_Marino" value="CET-1CEST,M3.5.0,M10.5.0/3" />
 	<zone name="Europe/Sarajevo" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Simferopol" value="MSK-4" />
+	<zone name="Europe/Simferopol" value="MSK-3" />
 	<zone name="Europe/Skopje" value="CET-1CEST,M3.5.0,M10.5.0/3" />
 	<zone name="Europe/Sofia" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
 	<zone name="Europe/Stockholm" value="CET-1CEST,M3.5.0,M10.5.0/3" />
 	<zone name="Europe/Tallinn" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
 	<zone name="Europe/Tirane" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Tiraspol" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
+	<zone name="Europe/Tiraspol" value="EET-2EEST,M3.5.0,M10.5.0/3" />
 	<zone name="Europe/Uzhgorod" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
 	<zone name="Europe/Vaduz" value="CET-1CEST,M3.5.0,M10.5.0/3" />
 	<zone name="Europe/Vatican" value="CET-1CEST,M3.5.0,M10.5.0/3" />
 	<zone name="Europe/Vienna" value="CET-1CEST,M3.5.0,M10.5.0/3" />
 	<zone name="Europe/Vilnius" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="Europe/Volgograd" value="VOLT-4" />
+	<zone name="Europe/Volgograd" value="MSK-3" />
 	<zone name="Europe/Warsaw" value="CET-1CEST,M3.5.0,M10.5.0/3" />
 	<zone name="Europe/Zagreb" value="CET-1CEST,M3.5.0,M10.5.0/3" />
 	<zone name="Europe/Zaporozhye" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
 	<zone name="Europe/Zurich" value="CET-1CEST,M3.5.0,M10.5.0/3" />
 
-	<zone name="Factory" value="<Local time zone must be set--see zic manual page>0" />
-
 	<zone name="GB" value="GMT0BST,M3.5.0/1,M10.5.0" />
 
 	<zone name="GB-Eire" value="GMT0BST,M3.5.0/1,M10.5.0" />
@@ -560,15 +561,16 @@
 
 	<zone name="PST8PDT" value="PST8PDT,M3.2.0,M11.1.0" />
 
-	<zone name="Pacific/Apia" value="WST-13WSDT,M9.5.0/3,M4.1.0/4" />
+	<zone name="Pacific/Apia" value="WSST-13WSDT,M9.5.0/3,M4.1.0/4" />
 	<zone name="Pacific/Auckland" value="NZST-12NZDT,M9.5.0,M4.1.0/3" />
+	<zone name="Pacific/Bougainville" value="BST-11" />
 	<zone name="Pacific/Chatham" value="CHAST-12:45CHADT,M9.5.0/2:45,M4.1.0/3:45" />
 	<zone name="Pacific/Chuuk" value="CHUT-10" />
-	<zone name="Pacific/Easter" value="EASST" />
+	<zone name="Pacific/Easter" value="EAST5" />
 	<zone name="Pacific/Efate" value="VUT-11" />
 	<zone name="Pacific/Enderbury" value="PHOT-13" />
 	<zone name="Pacific/Fakaofo" value="TKT-13" />
-	<zone name="Pacific/Fiji" value="FJST" />
+	<zone name="Pacific/Fiji" value="FJT-12FJST,M11.1.0,M1.3.0/3" />
 	<zone name="Pacific/Funafuti" value="TVT-12" />
 	<zone name="Pacific/Galapagos" value="GALT6" />
 	<zone name="Pacific/Gambier" value="GAMT9" />
@@ -584,7 +586,7 @@
 	<zone name="Pacific/Midway" value="SST11" />
 	<zone name="Pacific/Nauru" value="NRT-12" />
 	<zone name="Pacific/Niue" value="NUT11" />
-	<zone name="Pacific/Norfolk" value="NFT-11:30" />
+	<zone name="Pacific/Norfolk" value="NFT-11" />
 	<zone name="Pacific/Noumea" value="NCT-11" />
 	<zone name="Pacific/Pago_Pago" value="SST11" />
 	<zone name="Pacific/Palau" value="PWT-9" />
@@ -613,26 +615,12 @@
 
 	<zone name="Singapore" value="SGT-8" />
 
-	<zone name="SystemV/AST4" value="AST4" />
-	<zone name="SystemV/AST4ADT" value="AST4ADT,M3.2.0,M11.1.0" />
-	<zone name="SystemV/CST6" value="CST6" />
-	<zone name="SystemV/CST6CDT" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="SystemV/EST5" value="EST5" />
-	<zone name="SystemV/EST5EDT" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="SystemV/HST10" value="HST10" />
-	<zone name="SystemV/MST7" value="MST7" />
-	<zone name="SystemV/MST7MDT" value="MST7MDT,M3.2.0,M11.1.0" />
-	<zone name="SystemV/PST8" value="PST8" />
-	<zone name="SystemV/PST8PDT" value="PST8PDT,M3.2.0,M11.1.0" />
-	<zone name="SystemV/YST9" value="GAMT9" />
-	<zone name="SystemV/YST9YDT" value="AKST9AKDT,M3.2.0,M11.1.0" />
-
 	<zone name="Turkey" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
 
 	<zone name="UCT" value="UCT0" />
 
 	<zone name="US/Alaska" value="AKST9AKDT,M3.2.0,M11.1.0" />
-	<zone name="US/Aleutian" value="HAST10HADT,M3.2.0,M11.1.0" />
+	<zone name="US/Aleutian" value="HST10HDT,M3.2.0,M11.1.0" />
 	<zone name="US/Arizona" value="MST7" />
 	<zone name="US/Central" value="CST6CDT,M3.2.0,M11.1.0" />
 	<zone name="US/East-Indiana" value="EST5EDT,M3.2.0,M11.1.0" />
@@ -649,14 +637,12 @@
 
 	<zone name="Universal" value="UTC0" />
 
-	<zone name="W-SU" value="MSK-4" />
+	<zone name="W-SU" value="MSK-3" />
 
 	<zone name="WET" value="WET0WEST,M3.5.0/1,M10.5.0" />
 
 	<zone name="Zulu" value="UTC0" />
 
-	<zone name="localtime" value="CST6CDT,M3.2.0,M11.1.0" />
-
 	<zone name="posix/Africa/Abidjan" value="GMT0" />
 	<zone name="posix/Africa/Accra" value="GMT0" />
 	<zone name="posix/Africa/Addis_Ababa" value="EAT-3" />
@@ -670,7 +656,7 @@
 	<zone name="posix/Africa/Blantyre" value="CAT-2" />
 	<zone name="posix/Africa/Brazzaville" value="WAT-1" />
 	<zone name="posix/Africa/Bujumbura" value="CAT-2" />
-	<zone name="posix/Africa/Cairo" value="EEST" />
+	<zone name="posix/Africa/Cairo" value="EET-2" />
 	<zone name="posix/Africa/Casablanca" value="WET0WEST,M3.5.0,M10.5.0/3" />
 	<zone name="posix/Africa/Ceuta" value="CET-1CEST,M3.5.0,M10.5.0/3" />
 	<zone name="posix/Africa/Conakry" value="GMT0" />
@@ -711,7 +697,7 @@
 	<zone name="posix/Africa/Tripoli" value="EET-2" />
 	<zone name="posix/Africa/Tunis" value="CET-1" />
 	<zone name="posix/Africa/Windhoek" value="WAT-1WAST,M9.1.0,M4.1.0" />
-	<zone name="posix/America/Adak" value="HAST10HADT,M3.2.0,M11.1.0" />
+	<zone name="posix/America/Adak" value="HST10HDT,M3.2.0,M11.1.0" />
 	<zone name="posix/America/Anchorage" value="AKST9AKDT,M3.2.0,M11.1.0" />
 	<zone name="posix/America/Anguilla" value="AST4" />
 	<zone name="posix/America/Antigua" value="AST4" />
@@ -732,7 +718,7 @@
 	<zone name="posix/America/Aruba" value="AST4" />
 	<zone name="posix/America/Asuncion" value="PYT4PYST,M10.1.0/0,M3.4.0/0" />
 	<zone name="posix/America/Atikokan" value="EST5" />
-	<zone name="posix/America/Atka" value="HAST10HADT,M3.2.0,M11.1.0" />
+	<zone name="posix/America/Atka" value="HST10HDT,M3.2.0,M11.1.0" />
 	<zone name="posix/America/Bahia" value="BRT3" />
 	<zone name="posix/America/Bahia_Banderas" value="CST6CDT,M4.1.0,M10.5.0" />
 	<zone name="posix/America/Barbados" value="AST4" />
@@ -745,11 +731,11 @@
 	<zone name="posix/America/Buenos_Aires" value="ART3" />
 	<zone name="posix/America/Cambridge_Bay" value="MST7MDT,M3.2.0,M11.1.0" />
 	<zone name="posix/America/Campo_Grande" value="AMT4AMST,M10.3.0/0,M2.3.0/0" />
-	<zone name="posix/America/Cancun" value="CST6CDT,M4.1.0,M10.5.0" />
+	<zone name="posix/America/Cancun" value="EST5" />
 	<zone name="posix/America/Caracas" value="VET4:30" />
 	<zone name="posix/America/Catamarca" value="ART3" />
 	<zone name="posix/America/Cayenne" value="GFT3" />
-	<zone name="posix/America/Cayman" value="EST5" />
+	<zone name="posix/America/Cayman" value="EST5EDT,M3.2.0,M11.1.0" />
 	<zone name="posix/America/Chicago" value="CST6CDT,M3.2.0,M11.1.0" />
 	<zone name="posix/America/Chihuahua" value="MST7MDT,M4.1.0,M10.5.0" />
 	<zone name="posix/America/Coral_Harbour" value="EST5" />
@@ -768,12 +754,13 @@
 	<zone name="posix/America/Eirunepe" value="ACT5" />
 	<zone name="posix/America/El_Salvador" value="CST6" />
 	<zone name="posix/America/Ensenada" value="PST8PDT,M3.2.0,M11.1.0" />
+	<zone name="posix/America/Fort_Nelson" value="MST7" />
 	<zone name="posix/America/Fort_Wayne" value="EST5EDT,M3.2.0,M11.1.0" />
 	<zone name="posix/America/Fortaleza" value="BRT3" />
 	<zone name="posix/America/Glace_Bay" value="AST4ADT,M3.2.0,M11.1.0" />
 	<zone name="posix/America/Godthab" value="WGST" />
 	<zone name="posix/America/Goose_Bay" value="AST4ADT,M3.2.0,M11.1.0" />
-	<zone name="posix/America/Grand_Turk" value="EST5EDT,M3.2.0,M11.1.0" />
+	<zone name="posix/America/Grand_Turk" value="AST4" />
 	<zone name="posix/America/Grenada" value="AST4" />
 	<zone name="posix/America/Guadeloupe" value="AST4" />
 	<zone name="posix/America/Guatemala" value="CST6" />
@@ -815,12 +802,12 @@
 	<zone name="posix/America/Mendoza" value="ART3" />
 	<zone name="posix/America/Menominee" value="CST6CDT,M3.2.0,M11.1.0" />
 	<zone name="posix/America/Merida" value="CST6CDT,M4.1.0,M10.5.0" />
-	<zone name="posix/America/Metlakatla" value="MeST8" />
+	<zone name="posix/America/Metlakatla" value="PST8" />
 	<zone name="posix/America/Mexico_City" value="CST6CDT,M4.1.0,M10.5.0" />
 	<zone name="posix/America/Miquelon" value="PMST3PMDT,M3.2.0,M11.1.0" />
 	<zone name="posix/America/Moncton" value="AST4ADT,M3.2.0,M11.1.0" />
 	<zone name="posix/America/Monterrey" value="CST6CDT,M4.1.0,M10.5.0" />
-	<zone name="posix/America/Montevideo" value="UYT3UYST,M10.1.0,M3.2.0" />
+	<zone name="posix/America/Montevideo" value="UYT3" />
 	<zone name="posix/America/Montreal" value="EST5EDT,M3.2.0,M11.1.0" />
 	<zone name="posix/America/Montserrat" value="AST4" />
 	<zone name="posix/America/Nassau" value="EST5EDT,M3.2.0,M11.1.0" />
@@ -850,7 +837,7 @@
 	<zone name="posix/America/Rosario" value="ART3" />
 	<zone name="posix/America/Santa_Isabel" value="PST8PDT,M4.1.0,M10.5.0" />
 	<zone name="posix/America/Santarem" value="BRT3" />
-	<zone name="posix/America/Santiago" value="CLST" />
+	<zone name="posix/America/Santiago" value="CLT3" />
 	<zone name="posix/America/Santo_Domingo" value="AST4" />
 	<zone name="posix/America/Sao_Paulo" value="BRT3BRST,M10.3.0/0,M2.3.0/0" />
 	<zone name="posix/America/Scoresbysund" value="EGT1EGST,M3.5.0/0,M10.5.0/1" />
@@ -875,13 +862,13 @@
 	<zone name="posix/America/Winnipeg" value="CST6CDT,M3.2.0,M11.1.0" />
 	<zone name="posix/America/Yakutat" value="AKST9AKDT,M3.2.0,M11.1.0" />
 	<zone name="posix/America/Yellowknife" value="MST7MDT,M3.2.0,M11.1.0" />
-	<zone name="posix/Antarctica/Casey" value="WST-8" />
+	<zone name="posix/Antarctica/Casey" value="AWST-8" />
 	<zone name="posix/Antarctica/Davis" value="DAVT-7" />
 	<zone name="posix/Antarctica/DumontDUrville" value="DDUT-10" />
 	<zone name="posix/Antarctica/Macquarie" value="MIST-11" />
 	<zone name="posix/Antarctica/Mawson" value="MAWT-5" />
 	<zone name="posix/Antarctica/McMurdo" value="NZST-12NZDT,M9.5.0,M4.1.0/3" />
-	<zone name="posix/Antarctica/Palmer" value="CLST" />
+	<zone name="posix/Antarctica/Palmer" value="CLT3" />
 	<zone name="posix/Antarctica/Rothera" value="ROTT3" />
 	<zone name="posix/Antarctica/South_Pole" value="NZST-12NZDT,M9.5.0,M4.1.0/3" />
 	<zone name="posix/Antarctica/Syowa" value="SYOT-3" />
@@ -904,7 +891,8 @@
 	<zone name="posix/Asia/Bishkek" value="KGT-6" />
 	<zone name="posix/Asia/Brunei" value="BNT-8" />
 	<zone name="posix/Asia/Calcutta" value="IST-5:30" />
-	<zone name="posix/Asia/Choibalsan" value="CHOT-8" />
+	<zone name="posix/Asia/Chita" value="IRKT-8" />
+	<zone name="posix/Asia/Choibalsan" value="CHOT-8CHOST,M3.5.6,M9.5.6/0" />
 	<zone name="posix/Asia/Chongqing" value="CST-8" />
 	<zone name="posix/Asia/Chungking" value="CST-8" />
 	<zone name="posix/Asia/Colombo" value="IST-5:30" />
@@ -919,8 +907,8 @@
 	<zone name="posix/Asia/Hebron" value="EEST" />
 	<zone name="posix/Asia/Ho_Chi_Minh" value="ICT-7" />
 	<zone name="posix/Asia/Hong_Kong" value="HKT-8" />
-	<zone name="posix/Asia/Hovd" value="HOVT-7" />
-	<zone name="posix/Asia/Irkutsk" value="IRKT-9" />
+	<zone name="posix/Asia/Hovd" value="HOVT-7HOVST,M3.5.6,M9.5.6/0" />
+	<zone name="posix/Asia/Irkutsk" value="IRKT-8" />
 	<zone name="posix/Asia/Istanbul" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
 	<zone name="posix/Asia/Jakarta" value="WIB-7" />
 	<zone name="posix/Asia/Jayapura" value="WIT-9" />
@@ -928,39 +916,40 @@
 	<zone name="posix/Asia/Kabul" value="AFT-4:30" />
 	<zone name="posix/Asia/Kamchatka" value="PETT-12" />
 	<zone name="posix/Asia/Karachi" value="PKT-5" />
-	<zone name="posix/Asia/Kashgar" value="CST-8" />
+	<zone name="posix/Asia/Kashgar" value="XJT-6" />
 	<zone name="posix/Asia/Kathmandu" value="NPT-5:45" />
 	<zone name="posix/Asia/Katmandu" value="NPT-5:45" />
-	<zone name="posix/Asia/Khandyga" value="YAKT-10" />
+	<zone name="posix/Asia/Khandyga" value="YAKT-9" />
 	<zone name="posix/Asia/Kolkata" value="IST-5:30" />
-	<zone name="posix/Asia/Krasnoyarsk" value="KRAT-8" />
+	<zone name="posix/Asia/Krasnoyarsk" value="KRAT-7" />
 	<zone name="posix/Asia/Kuala_Lumpur" value="MYT-8" />
 	<zone name="posix/Asia/Kuching" value="MYT-8" />
 	<zone name="posix/Asia/Kuwait" value="AST-3" />
 	<zone name="posix/Asia/Macao" value="CST-8" />
 	<zone name="posix/Asia/Macau" value="CST-8" />
-	<zone name="posix/Asia/Magadan" value="MAGT-12" />
+	<zone name="posix/Asia/Magadan" value="MAGT-10" />
 	<zone name="posix/Asia/Makassar" value="WITA-8" />
 	<zone name="posix/Asia/Manila" value="PHT-8" />
 	<zone name="posix/Asia/Muscat" value="GST-4" />
 	<zone name="posix/Asia/Nicosia" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="posix/Asia/Novokuznetsk" value="NOVT-7" />
-	<zone name="posix/Asia/Novosibirsk" value="NOVT-7" />
-	<zone name="posix/Asia/Omsk" value="OMST-7" />
+	<zone name="posix/Asia/Novokuznetsk" value="KRAT-7" />
+	<zone name="posix/Asia/Novosibirsk" value="NOVT-6" />
+	<zone name="posix/Asia/Omsk" value="OMST-6" />
 	<zone name="posix/Asia/Oral" value="ORAT-5" />
 	<zone name="posix/Asia/Phnom_Penh" value="ICT-7" />
 	<zone name="posix/Asia/Pontianak" value="WIB-7" />
-	<zone name="posix/Asia/Pyongyang" value="KST-9" />
+	<zone name="posix/Asia/Pyongyang" value="KST-8:30" />
 	<zone name="posix/Asia/Qatar" value="AST-3" />
 	<zone name="posix/Asia/Qyzylorda" value="QYZT-6" />
 	<zone name="posix/Asia/Rangoon" value="MMT-6:30" />
 	<zone name="posix/Asia/Riyadh" value="AST-3" />
 	<zone name="posix/Asia/Saigon" value="ICT-7" />
-	<zone name="posix/Asia/Sakhalin" value="SAKT-11" />
+	<zone name="posix/Asia/Sakhalin" value="SAKT-10" />
 	<zone name="posix/Asia/Samarkand" value="UZT-5" />
 	<zone name="posix/Asia/Seoul" value="KST-9" />
 	<zone name="posix/Asia/Shanghai" value="CST-8" />
 	<zone name="posix/Asia/Singapore" value="SGT-8" />
+	<zone name="posix/Asia/Srednekolymsk" value="SRET-11" />
 	<zone name="posix/Asia/Taipei" value="CST-8" />
 	<zone name="posix/Asia/Tashkent" value="UZT-5" />
 	<zone name="posix/Asia/Tbilisi" value="GET-4" />
@@ -970,14 +959,14 @@
 	<zone name="posix/Asia/Thimphu" value="BTT-6" />
 	<zone name="posix/Asia/Tokyo" value="JST-9" />
 	<zone name="posix/Asia/Ujung_Pandang" value="WITA-8" />
-	<zone name="posix/Asia/Ulaanbaatar" value="ULAT-8" />
-	<zone name="posix/Asia/Ulan_Bator" value="ULAT-8" />
-	<zone name="posix/Asia/Urumqi" value="CST-8" />
-	<zone name="posix/Asia/Ust-Nera" value="VLAT-11" />
+	<zone name="posix/Asia/Ulaanbaatar" value="ULAT-8ULAST,M3.5.6,M9.5.6/0" />
+	<zone name="posix/Asia/Ulan_Bator" value="ULAT-8ULAST,M3.5.6,M9.5.6/0" />
+	<zone name="posix/Asia/Urumqi" value="XJT-6" />
+	<zone name="posix/Asia/Ust-Nera" value="VLAT-10" />
 	<zone name="posix/Asia/Vientiane" value="ICT-7" />
-	<zone name="posix/Asia/Vladivostok" value="VLAT-11" />
-	<zone name="posix/Asia/Yakutsk" value="YAKT-10" />
-	<zone name="posix/Asia/Yekaterinburg" value="YEKT-6" />
+	<zone name="posix/Asia/Vladivostok" value="VLAT-10" />
+	<zone name="posix/Asia/Yakutsk" value="YAKT-9" />
+	<zone name="posix/Asia/Yekaterinburg" value="YEKT-5" />
 	<zone name="posix/Asia/Yerevan" value="AMT-4" />
 	<zone name="posix/Atlantic/Azores" value="AZOT1AZOST,M3.5.0/0,M10.5.0/1" />
 	<zone name="posix/Atlantic/Bermuda" value="AST4ADT,M3.2.0,M11.1.0" />
@@ -991,29 +980,29 @@
 	<zone name="posix/Atlantic/South_Georgia" value="GST2" />
 	<zone name="posix/Atlantic/St_Helena" value="GMT0" />
 	<zone name="posix/Atlantic/Stanley" value="FKST3" />
-	<zone name="posix/Australia/ACT" value="EST-10EST,M10.1.0,M4.1.0/3" />
-	<zone name="posix/Australia/Adelaide" value="CST-9:30CST,M10.1.0,M4.1.0/3" />
-	<zone name="posix/Australia/Brisbane" value="EST-10" />
-	<zone name="posix/Australia/Broken_Hill" value="CST-9:30CST,M10.1.0,M4.1.0/3" />
-	<zone name="posix/Australia/Canberra" value="EST-10EST,M10.1.0,M4.1.0/3" />
-	<zone name="posix/Australia/Currie" value="EST-10EST,M10.1.0,M4.1.0/3" />
-	<zone name="posix/Australia/Darwin" value="CST-9:30" />
-	<zone name="posix/Australia/Eucla" value="CWST-8:45" />
-	<zone name="posix/Australia/Hobart" value="EST-10EST,M10.1.0,M4.1.0/3" />
-	<zone name="posix/Australia/LHI" value="LHST-10:30LHST-11,M10.1.0,M4.1.0" />
-	<zone name="posix/Australia/Lindeman" value="EST-10" />
-	<zone name="posix/Australia/Lord_Howe" value="LHST-10:30LHST-11,M10.1.0,M4.1.0" />
-	<zone name="posix/Australia/Melbourne" value="EST-10EST,M10.1.0,M4.1.0/3" />
-	<zone name="posix/Australia/NSW" value="EST-10EST,M10.1.0,M4.1.0/3" />
-	<zone name="posix/Australia/North" value="CST-9:30" />
-	<zone name="posix/Australia/Perth" value="WST-8" />
-	<zone name="posix/Australia/Queensland" value="EST-10" />
-	<zone name="posix/Australia/South" value="CST-9:30CST,M10.1.0,M4.1.0/3" />
-	<zone name="posix/Australia/Sydney" value="EST-10EST,M10.1.0,M4.1.0/3" />
-	<zone name="posix/Australia/Tasmania" value="EST-10EST,M10.1.0,M4.1.0/3" />
-	<zone name="posix/Australia/Victoria" value="EST-10EST,M10.1.0,M4.1.0/3" />
-	<zone name="posix/Australia/West" value="WST-8" />
-	<zone name="posix/Australia/Yancowinna" value="CST-9:30CST,M10.1.0,M4.1.0/3" />
+	<zone name="posix/Australia/ACT" value="AEST-10AEDT,M10.1.0,M4.1.0/3" />
+	<zone name="posix/Australia/Adelaide" value="ACST-9:30ACDT,M10.1.0,M4.1.0/3" />
+	<zone name="posix/Australia/Brisbane" value="AEST-10" />
+	<zone name="posix/Australia/Broken_Hill" value="ACST-9:30ACDT,M10.1.0,M4.1.0/3" />
+	<zone name="posix/Australia/Canberra" value="AEST-10AEDT,M10.1.0,M4.1.0/3" />
+	<zone name="posix/Australia/Currie" value="AEST-10AEDT,M10.1.0,M4.1.0/3" />
+	<zone name="posix/Australia/Darwin" value="ACST-9:30" />
+	<zone name="posix/Australia/Eucla" value="ACWST-8:45" />
+	<zone name="posix/Australia/Hobart" value="AEST-10AEDT,M10.1.0,M4.1.0/3" />
+	<zone name="posix/Australia/LHI" value="LHST-10:30LHDT-11,M10.1.0,M4.1.0" />
+	<zone name="posix/Australia/Lindeman" value="AEST-10" />
+	<zone name="posix/Australia/Lord_Howe" value="LHST-10:30LHDT-11,M10.1.0,M4.1.0" />
+	<zone name="posix/Australia/Melbourne" value="AEST-10AEDT,M10.1.0,M4.1.0/3" />
+	<zone name="posix/Australia/NSW" value="AEST-10AEDT,M10.1.0,M4.1.0/3" />
+	<zone name="posix/Australia/North" value="ACST-9:30" />
+	<zone name="posix/Australia/Perth" value="AWST-8" />
+	<zone name="posix/Australia/Queensland" value="AEST-10" />
+	<zone name="posix/Australia/South" value="ACST-9:30ACDT,M10.1.0,M4.1.0/3" />
+	<zone name="posix/Australia/Sydney" value="AEST-10AEDT,M10.1.0,M4.1.0/3" />
+	<zone name="posix/Australia/Tasmania" value="AEST-10AEDT,M10.1.0,M4.1.0/3" />
+	<zone name="posix/Australia/Victoria" value="AEST-10AEDT,M10.1.0,M4.1.0/3" />
+	<zone name="posix/Australia/West" value="AWST-8" />
+	<zone name="posix/Australia/Yancowinna" value="ACST-9:30ACDT,M10.1.0,M4.1.0/3" />
 	<zone name="posix/Brazil/Acre" value="ACT5" />
 	<zone name="posix/Brazil/DeNoronha" value="FNT2" />
 	<zone name="posix/Brazil/East" value="BRT3BRST,M10.3.0/0,M2.3.0/0" />
@@ -1029,43 +1018,43 @@
 	<zone name="posix/Canada/Pacific" value="PST8PDT,M3.2.0,M11.1.0" />
 	<zone name="posix/Canada/Saskatchewan" value="CST6" />
 	<zone name="posix/Canada/Yukon" value="PST8PDT,M3.2.0,M11.1.0" />
-	<zone name="posix/Chile/Continental" value="CLST" />
-	<zone name="posix/Chile/EasterIsland" value="EASST" />
+	<zone name="posix/Chile/Continental" value="CLT3" />
+	<zone name="posix/Chile/EasterIsland" value="EAST5" />
 	<zone name="posix/Cuba" value="CST5CDT,M3.2.0/0,M11.1.0/1" />
 	<zone name="posix/EET" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
 	<zone name="posix/EST" value="EST5" />
 	<zone name="posix/EST5EDT" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="posix/Egypt" value="EEST" />
+	<zone name="posix/Egypt" value="EET-2" />
 	<zone name="posix/Eire" value="GMT0IST,M3.5.0/1,M10.5.0" />
 	<zone name="posix/Etc/GMT" value="GMT0" />
 	<zone name="posix/Etc/GMT+0" value="GMT0" />
-	<zone name="posix/Etc/GMT+1" value="<GMT+1>1" />
-	<zone name="posix/Etc/GMT+10" value="<GMT+10>10" />
-	<zone name="posix/Etc/GMT+11" value="<GMT+11>11" />
-	<zone name="posix/Etc/GMT+12" value="<GMT+12>12" />
-	<zone name="posix/Etc/GMT+2" value="<GMT+2>2" />
-	<zone name="posix/Etc/GMT+3" value="<GMT+3>3" />
-	<zone name="posix/Etc/GMT+4" value="<GMT+4>4" />
-	<zone name="posix/Etc/GMT+5" value="<GMT+5>5" />
-	<zone name="posix/Etc/GMT+6" value="<GMT+6>6" />
-	<zone name="posix/Etc/GMT+7" value="<GMT+7>7" />
-	<zone name="posix/Etc/GMT+8" value="<GMT+8>8" />
-	<zone name="posix/Etc/GMT+9" value="<GMT+9>9" />
+	<zone name="posix/Etc/GMT+1" value="&lt;GMT+1&gt;1" />
+	<zone name="posix/Etc/GMT+10" value="&lt;GMT+10&gt;10" />
+	<zone name="posix/Etc/GMT+11" value="&lt;GMT+11&gt;11" />
+	<zone name="posix/Etc/GMT+12" value="&lt;GMT+12&gt;12" />
+	<zone name="posix/Etc/GMT+2" value="&lt;GMT+2&gt;2" />
+	<zone name="posix/Etc/GMT+3" value="&lt;GMT+3&gt;3" />
+	<zone name="posix/Etc/GMT+4" value="&lt;GMT+4&gt;4" />
+	<zone name="posix/Etc/GMT+5" value="&lt;GMT+5&gt;5" />
+	<zone name="posix/Etc/GMT+6" value="&lt;GMT+6&gt;6" />
+	<zone name="posix/Etc/GMT+7" value="&lt;GMT+7&gt;7" />
+	<zone name="posix/Etc/GMT+8" value="&lt;GMT+8&gt;8" />
+	<zone name="posix/Etc/GMT+9" value="&lt;GMT+9&gt;9" />
 	<zone name="posix/Etc/GMT-0" value="GMT0" />
-	<zone name="posix/Etc/GMT-1" value="<GMT-1>-1" />
-	<zone name="posix/Etc/GMT-10" value="<GMT-10>-10" />
-	<zone name="posix/Etc/GMT-11" value="<GMT-11>-11" />
-	<zone name="posix/Etc/GMT-12" value="<GMT-12>-12" />
-	<zone name="posix/Etc/GMT-13" value="<GMT-13>-13" />
-	<zone name="posix/Etc/GMT-14" value="<GMT-14>-14" />
-	<zone name="posix/Etc/GMT-2" value="<GMT-2>-2" />
-	<zone name="posix/Etc/GMT-3" value="<GMT-3>-3" />
-	<zone name="posix/Etc/GMT-4" value="<GMT-4>-4" />
-	<zone name="posix/Etc/GMT-5" value="<GMT-5>-5" />
-	<zone name="posix/Etc/GMT-6" value="<GMT-6>-6" />
-	<zone name="posix/Etc/GMT-7" value="<GMT-7>-7" />
-	<zone name="posix/Etc/GMT-8" value="<GMT-8>-8" />
-	<zone name="posix/Etc/GMT-9" value="<GMT-9>-9" />
+	<zone name="posix/Etc/GMT-1" value="&lt;GMT-1&gt;-1" />
+	<zone name="posix/Etc/GMT-10" value="&lt;GMT-10&gt;-10" />
+	<zone name="posix/Etc/GMT-11" value="&lt;GMT-11&gt;-11" />
+	<zone name="posix/Etc/GMT-12" value="&lt;GMT-12&gt;-12" />
+	<zone name="posix/Etc/GMT-13" value="&lt;GMT-13&gt;-13" />
+	<zone name="posix/Etc/GMT-14" value="&lt;GMT-14&gt;-14" />
+	<zone name="posix/Etc/GMT-2" value="&lt;GMT-2&gt;-2" />
+	<zone name="posix/Etc/GMT-3" value="&lt;GMT-3&gt;-3" />
+	<zone name="posix/Etc/GMT-4" value="&lt;GMT-4&gt;-4" />
+	<zone name="posix/Etc/GMT-5" value="&lt;GMT-5&gt;-5" />
+	<zone name="posix/Etc/GMT-6" value="&lt;GMT-6&gt;-6" />
+	<zone name="posix/Etc/GMT-7" value="&lt;GMT-7&gt;-7" />
+	<zone name="posix/Etc/GMT-8" value="&lt;GMT-8&gt;-8" />
+	<zone name="posix/Etc/GMT-9" value="&lt;GMT-9&gt;-9" />
 	<zone name="posix/Etc/GMT0" value="GMT0" />
 	<zone name="posix/Etc/Greenwich" value="GMT0" />
 	<zone name="posix/Etc/UCT" value="UCT0" />
@@ -1083,7 +1072,7 @@
 	<zone name="posix/Europe/Bucharest" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
 	<zone name="posix/Europe/Budapest" value="CET-1CEST,M3.5.0,M10.5.0/3" />
 	<zone name="posix/Europe/Busingen" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="posix/Europe/Chisinau" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
+	<zone name="posix/Europe/Chisinau" value="EET-2EEST,M3.5.0,M10.5.0/3" />
 	<zone name="posix/Europe/Copenhagen" value="CET-1CEST,M3.5.0,M10.5.0/3" />
 	<zone name="posix/Europe/Dublin" value="GMT0IST,M3.5.0/1,M10.5.0" />
 	<zone name="posix/Europe/Gibraltar" value="CET-1CEST,M3.5.0,M10.5.0/3" />
@@ -1092,7 +1081,7 @@
 	<zone name="posix/Europe/Isle_of_Man" value="GMT0BST,M3.5.0/1,M10.5.0" />
 	<zone name="posix/Europe/Istanbul" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
 	<zone name="posix/Europe/Jersey" value="GMT0BST,M3.5.0/1,M10.5.0" />
-	<zone name="posix/Europe/Kaliningrad" value="FET-3" />
+	<zone name="posix/Europe/Kaliningrad" value="EET-2" />
 	<zone name="posix/Europe/Kiev" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
 	<zone name="posix/Europe/Lisbon" value="WET0WEST,M3.5.0/1,M10.5.0" />
 	<zone name="posix/Europe/Ljubljana" value="CET-1CEST,M3.5.0,M10.5.0/3" />
@@ -1101,9 +1090,9 @@
 	<zone name="posix/Europe/Madrid" value="CET-1CEST,M3.5.0,M10.5.0/3" />
 	<zone name="posix/Europe/Malta" value="CET-1CEST,M3.5.0,M10.5.0/3" />
 	<zone name="posix/Europe/Mariehamn" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="posix/Europe/Minsk" value="FET-3" />
+	<zone name="posix/Europe/Minsk" value="MSK-3" />
 	<zone name="posix/Europe/Monaco" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="posix/Europe/Moscow" value="MSK-4" />
+	<zone name="posix/Europe/Moscow" value="MSK-3" />
 	<zone name="posix/Europe/Nicosia" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
 	<zone name="posix/Europe/Oslo" value="CET-1CEST,M3.5.0,M10.5.0/3" />
 	<zone name="posix/Europe/Paris" value="CET-1CEST,M3.5.0,M10.5.0/3" />
@@ -1114,24 +1103,23 @@
 	<zone name="posix/Europe/Samara" value="SAMT-4" />
 	<zone name="posix/Europe/San_Marino" value="CET-1CEST,M3.5.0,M10.5.0/3" />
 	<zone name="posix/Europe/Sarajevo" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="posix/Europe/Simferopol" value="MSK-4" />
+	<zone name="posix/Europe/Simferopol" value="MSK-3" />
 	<zone name="posix/Europe/Skopje" value="CET-1CEST,M3.5.0,M10.5.0/3" />
 	<zone name="posix/Europe/Sofia" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
 	<zone name="posix/Europe/Stockholm" value="CET-1CEST,M3.5.0,M10.5.0/3" />
 	<zone name="posix/Europe/Tallinn" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
 	<zone name="posix/Europe/Tirane" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="posix/Europe/Tiraspol" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
+	<zone name="posix/Europe/Tiraspol" value="EET-2EEST,M3.5.0,M10.5.0/3" />
 	<zone name="posix/Europe/Uzhgorod" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
 	<zone name="posix/Europe/Vaduz" value="CET-1CEST,M3.5.0,M10.5.0/3" />
 	<zone name="posix/Europe/Vatican" value="CET-1CEST,M3.5.0,M10.5.0/3" />
 	<zone name="posix/Europe/Vienna" value="CET-1CEST,M3.5.0,M10.5.0/3" />
 	<zone name="posix/Europe/Vilnius" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="posix/Europe/Volgograd" value="VOLT-4" />
+	<zone name="posix/Europe/Volgograd" value="MSK-3" />
 	<zone name="posix/Europe/Warsaw" value="CET-1CEST,M3.5.0,M10.5.0/3" />
 	<zone name="posix/Europe/Zagreb" value="CET-1CEST,M3.5.0,M10.5.0/3" />
 	<zone name="posix/Europe/Zaporozhye" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
 	<zone name="posix/Europe/Zurich" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="posix/Factory" value="<Local time zone must be set--see zic manual page>0" />
 	<zone name="posix/GB" value="GMT0BST,M3.5.0/1,M10.5.0" />
 	<zone name="posix/GB-Eire" value="GMT0BST,M3.5.0/1,M10.5.0" />
 	<zone name="posix/GMT" value="GMT0" />
@@ -1170,15 +1158,16 @@
 	<zone name="posix/Navajo" value="MST7MDT,M3.2.0,M11.1.0" />
 	<zone name="posix/PRC" value="CST-8" />
 	<zone name="posix/PST8PDT" value="PST8PDT,M3.2.0,M11.1.0" />
-	<zone name="posix/Pacific/Apia" value="WST-13WSDT,M9.5.0/3,M4.1.0/4" />
+	<zone name="posix/Pacific/Apia" value="WSST-13WSDT,M9.5.0/3,M4.1.0/4" />
 	<zone name="posix/Pacific/Auckland" value="NZST-12NZDT,M9.5.0,M4.1.0/3" />
+	<zone name="posix/Pacific/Bougainville" value="BST-11" />
 	<zone name="posix/Pacific/Chatham" value="CHAST-12:45CHADT,M9.5.0/2:45,M4.1.0/3:45" />
 	<zone name="posix/Pacific/Chuuk" value="CHUT-10" />
-	<zone name="posix/Pacific/Easter" value="EASST" />
+	<zone name="posix/Pacific/Easter" value="EAST5" />
 	<zone name="posix/Pacific/Efate" value="VUT-11" />
 	<zone name="posix/Pacific/Enderbury" value="PHOT-13" />
 	<zone name="posix/Pacific/Fakaofo" value="TKT-13" />
-	<zone name="posix/Pacific/Fiji" value="FJST" />
+	<zone name="posix/Pacific/Fiji" value="FJT-12FJST,M11.1.0,M1.3.0/3" />
 	<zone name="posix/Pacific/Funafuti" value="TVT-12" />
 	<zone name="posix/Pacific/Galapagos" value="GALT6" />
 	<zone name="posix/Pacific/Gambier" value="GAMT9" />
@@ -1194,7 +1183,7 @@
 	<zone name="posix/Pacific/Midway" value="SST11" />
 	<zone name="posix/Pacific/Nauru" value="NRT-12" />
 	<zone name="posix/Pacific/Niue" value="NUT11" />
-	<zone name="posix/Pacific/Norfolk" value="NFT-11:30" />
+	<zone name="posix/Pacific/Norfolk" value="NFT-11" />
 	<zone name="posix/Pacific/Noumea" value="NCT-11" />
 	<zone name="posix/Pacific/Pago_Pago" value="SST11" />
 	<zone name="posix/Pacific/Palau" value="PWT-9" />
@@ -1217,23 +1206,10 @@
 	<zone name="posix/ROC" value="CST-8" />
 	<zone name="posix/ROK" value="KST-9" />
 	<zone name="posix/Singapore" value="SGT-8" />
-	<zone name="posix/SystemV/AST4" value="AST4" />
-	<zone name="posix/SystemV/AST4ADT" value="AST4ADT,M3.2.0,M11.1.0" />
-	<zone name="posix/SystemV/CST6" value="CST6" />
-	<zone name="posix/SystemV/CST6CDT" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="posix/SystemV/EST5" value="EST5" />
-	<zone name="posix/SystemV/EST5EDT" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="posix/SystemV/HST10" value="HST10" />
-	<zone name="posix/SystemV/MST7" value="MST7" />
-	<zone name="posix/SystemV/MST7MDT" value="MST7MDT,M3.2.0,M11.1.0" />
-	<zone name="posix/SystemV/PST8" value="PST8" />
-	<zone name="posix/SystemV/PST8PDT" value="PST8PDT,M3.2.0,M11.1.0" />
-	<zone name="posix/SystemV/YST9" value="GAMT9" />
-	<zone name="posix/SystemV/YST9YDT" value="AKST9AKDT,M3.2.0,M11.1.0" />
 	<zone name="posix/Turkey" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
 	<zone name="posix/UCT" value="UCT0" />
 	<zone name="posix/US/Alaska" value="AKST9AKDT,M3.2.0,M11.1.0" />
-	<zone name="posix/US/Aleutian" value="HAST10HADT,M3.2.0,M11.1.0" />
+	<zone name="posix/US/Aleutian" value="HST10HDT,M3.2.0,M11.1.0" />
 	<zone name="posix/US/Arizona" value="MST7" />
 	<zone name="posix/US/Central" value="CST6CDT,M3.2.0,M11.1.0" />
 	<zone name="posix/US/East-Indiana" value="EST5EDT,M3.2.0,M11.1.0" />
@@ -1247,7 +1223,7 @@
 	<zone name="posix/US/Samoa" value="SST11" />
 	<zone name="posix/UTC" value="UTC0" />
 	<zone name="posix/Universal" value="UTC0" />
-	<zone name="posix/W-SU" value="MSK-4" />
+	<zone name="posix/W-SU" value="MSK-3" />
 	<zone name="posix/WET" value="WET0WEST,M3.5.0/1,M10.5.0" />
 	<zone name="posix/Zulu" value="UTC0" />
 
@@ -1266,7 +1242,7 @@
 	<zone name="right/Africa/Blantyre" value="CAT-2" />
 	<zone name="right/Africa/Brazzaville" value="WAT-1" />
 	<zone name="right/Africa/Bujumbura" value="CAT-2" />
-	<zone name="right/Africa/Cairo" value="EEST" />
+	<zone name="right/Africa/Cairo" value="EET-2" />
 	<zone name="right/Africa/Casablanca" value="WET0WEST,M3.5.0,M10.5.0/3" />
 	<zone name="right/Africa/Ceuta" value="CET-1CEST,M3.5.0,M10.5.0/3" />
 	<zone name="right/Africa/Conakry" value="GMT0" />
@@ -1307,7 +1283,7 @@
 	<zone name="right/Africa/Tripoli" value="EET-2" />
 	<zone name="right/Africa/Tunis" value="CET-1" />
 	<zone name="right/Africa/Windhoek" value="WAT-1WAST,M9.1.0,M4.1.0" />
-	<zone name="right/America/Adak" value="HAST10HADT,M3.2.0,M11.1.0" />
+	<zone name="right/America/Adak" value="HST10HDT,M3.2.0,M11.1.0" />
 	<zone name="right/America/Anchorage" value="AKST9AKDT,M3.2.0,M11.1.0" />
 	<zone name="right/America/Anguilla" value="AST4" />
 	<zone name="right/America/Antigua" value="AST4" />
@@ -1328,7 +1304,7 @@
 	<zone name="right/America/Aruba" value="AST4" />
 	<zone name="right/America/Asuncion" value="PYT4PYST,M10.1.0/0,M3.4.0/0" />
 	<zone name="right/America/Atikokan" value="EST5" />
-	<zone name="right/America/Atka" value="HAST10HADT,M3.2.0,M11.1.0" />
+	<zone name="right/America/Atka" value="HST10HDT,M3.2.0,M11.1.0" />
 	<zone name="right/America/Bahia" value="BRT3" />
 	<zone name="right/America/Bahia_Banderas" value="CST6CDT,M4.1.0,M10.5.0" />
 	<zone name="right/America/Barbados" value="AST4" />
@@ -1341,11 +1317,11 @@
 	<zone name="right/America/Buenos_Aires" value="ART3" />
 	<zone name="right/America/Cambridge_Bay" value="MST7MDT,M3.2.0,M11.1.0" />
 	<zone name="right/America/Campo_Grande" value="AMT4AMST,M10.3.0/0,M2.3.0/0" />
-	<zone name="right/America/Cancun" value="CST6CDT,M4.1.0,M10.5.0" />
+	<zone name="right/America/Cancun" value="EST5" />
 	<zone name="right/America/Caracas" value="VET4:30" />
 	<zone name="right/America/Catamarca" value="ART3" />
 	<zone name="right/America/Cayenne" value="GFT3" />
-	<zone name="right/America/Cayman" value="EST5" />
+	<zone name="right/America/Cayman" value="EST5EDT,M3.2.0,M11.1.0" />
 	<zone name="right/America/Chicago" value="CST6CDT,M3.2.0,M11.1.0" />
 	<zone name="right/America/Chihuahua" value="MST7MDT,M4.1.0,M10.5.0" />
 	<zone name="right/America/Coral_Harbour" value="EST5" />
@@ -1364,12 +1340,13 @@
 	<zone name="right/America/Eirunepe" value="ACT5" />
 	<zone name="right/America/El_Salvador" value="CST6" />
 	<zone name="right/America/Ensenada" value="PST8PDT,M3.2.0,M11.1.0" />
+	<zone name="right/America/Fort_Nelson" value="MST7" />
 	<zone name="right/America/Fort_Wayne" value="EST5EDT,M3.2.0,M11.1.0" />
 	<zone name="right/America/Fortaleza" value="BRT3" />
 	<zone name="right/America/Glace_Bay" value="AST4ADT,M3.2.0,M11.1.0" />
 	<zone name="right/America/Godthab" value="WGST" />
 	<zone name="right/America/Goose_Bay" value="AST4ADT,M3.2.0,M11.1.0" />
-	<zone name="right/America/Grand_Turk" value="EST5EDT,M3.2.0,M11.1.0" />
+	<zone name="right/America/Grand_Turk" value="AST4" />
 	<zone name="right/America/Grenada" value="AST4" />
 	<zone name="right/America/Guadeloupe" value="AST4" />
 	<zone name="right/America/Guatemala" value="CST6" />
@@ -1411,12 +1388,12 @@
 	<zone name="right/America/Mendoza" value="ART3" />
 	<zone name="right/America/Menominee" value="CST6CDT,M3.2.0,M11.1.0" />
 	<zone name="right/America/Merida" value="CST6CDT,M4.1.0,M10.5.0" />
-	<zone name="right/America/Metlakatla" value="MeST8" />
+	<zone name="right/America/Metlakatla" value="PST8" />
 	<zone name="right/America/Mexico_City" value="CST6CDT,M4.1.0,M10.5.0" />
 	<zone name="right/America/Miquelon" value="PMST3PMDT,M3.2.0,M11.1.0" />
 	<zone name="right/America/Moncton" value="AST4ADT,M3.2.0,M11.1.0" />
 	<zone name="right/America/Monterrey" value="CST6CDT,M4.1.0,M10.5.0" />
-	<zone name="right/America/Montevideo" value="UYT3UYST,M10.1.0,M3.2.0" />
+	<zone name="right/America/Montevideo" value="UYT3" />
 	<zone name="right/America/Montreal" value="EST5EDT,M3.2.0,M11.1.0" />
 	<zone name="right/America/Montserrat" value="AST4" />
 	<zone name="right/America/Nassau" value="EST5EDT,M3.2.0,M11.1.0" />
@@ -1446,7 +1423,7 @@
 	<zone name="right/America/Rosario" value="ART3" />
 	<zone name="right/America/Santa_Isabel" value="PST8PDT,M4.1.0,M10.5.0" />
 	<zone name="right/America/Santarem" value="BRT3" />
-	<zone name="right/America/Santiago" value="CLST" />
+	<zone name="right/America/Santiago" value="CLT3" />
 	<zone name="right/America/Santo_Domingo" value="AST4" />
 	<zone name="right/America/Sao_Paulo" value="BRT3BRST,M10.3.0/0,M2.3.0/0" />
 	<zone name="right/America/Scoresbysund" value="EGT1EGST,M3.5.0/0,M10.5.0/1" />
@@ -1471,13 +1448,13 @@
 	<zone name="right/America/Winnipeg" value="CST6CDT,M3.2.0,M11.1.0" />
 	<zone name="right/America/Yakutat" value="AKST9AKDT,M3.2.0,M11.1.0" />
 	<zone name="right/America/Yellowknife" value="MST7MDT,M3.2.0,M11.1.0" />
-	<zone name="right/Antarctica/Casey" value="WST-8" />
+	<zone name="right/Antarctica/Casey" value="AWST-8" />
 	<zone name="right/Antarctica/Davis" value="DAVT-7" />
 	<zone name="right/Antarctica/DumontDUrville" value="DDUT-10" />
 	<zone name="right/Antarctica/Macquarie" value="MIST-11" />
 	<zone name="right/Antarctica/Mawson" value="MAWT-5" />
 	<zone name="right/Antarctica/McMurdo" value="NZST-12NZDT,M9.5.0,M4.1.0/3" />
-	<zone name="right/Antarctica/Palmer" value="CLST" />
+	<zone name="right/Antarctica/Palmer" value="CLT3" />
 	<zone name="right/Antarctica/Rothera" value="ROTT3" />
 	<zone name="right/Antarctica/South_Pole" value="NZST-12NZDT,M9.5.0,M4.1.0/3" />
 	<zone name="right/Antarctica/Syowa" value="SYOT-3" />
@@ -1500,7 +1477,8 @@
 	<zone name="right/Asia/Bishkek" value="KGT-6" />
 	<zone name="right/Asia/Brunei" value="BNT-8" />
 	<zone name="right/Asia/Calcutta" value="IST-5:30" />
-	<zone name="right/Asia/Choibalsan" value="CHOT-8" />
+	<zone name="right/Asia/Chita" value="IRKT-8" />
+	<zone name="right/Asia/Choibalsan" value="CHOT-8CHOST,M3.5.6,M9.5.6/0" />
 	<zone name="right/Asia/Chongqing" value="CST-8" />
 	<zone name="right/Asia/Chungking" value="CST-8" />
 	<zone name="right/Asia/Colombo" value="IST-5:30" />
@@ -1515,8 +1493,8 @@
 	<zone name="right/Asia/Hebron" value="EEST" />
 	<zone name="right/Asia/Ho_Chi_Minh" value="ICT-7" />
 	<zone name="right/Asia/Hong_Kong" value="HKT-8" />
-	<zone name="right/Asia/Hovd" value="HOVT-7" />
-	<zone name="right/Asia/Irkutsk" value="IRKT-9" />
+	<zone name="right/Asia/Hovd" value="HOVT-7HOVST,M3.5.6,M9.5.6/0" />
+	<zone name="right/Asia/Irkutsk" value="IRKT-8" />
 	<zone name="right/Asia/Istanbul" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
 	<zone name="right/Asia/Jakarta" value="WIB-7" />
 	<zone name="right/Asia/Jayapura" value="WIT-9" />
@@ -1524,39 +1502,40 @@
 	<zone name="right/Asia/Kabul" value="AFT-4:30" />
 	<zone name="right/Asia/Kamchatka" value="PETT-12" />
 	<zone name="right/Asia/Karachi" value="PKT-5" />
-	<zone name="right/Asia/Kashgar" value="CST-8" />
+	<zone name="right/Asia/Kashgar" value="XJT-6" />
 	<zone name="right/Asia/Kathmandu" value="NPT-5:45" />
 	<zone name="right/Asia/Katmandu" value="NPT-5:45" />
-	<zone name="right/Asia/Khandyga" value="YAKT-10" />
+	<zone name="right/Asia/Khandyga" value="YAKT-9" />
 	<zone name="right/Asia/Kolkata" value="IST-5:30" />
-	<zone name="right/Asia/Krasnoyarsk" value="KRAT-8" />
+	<zone name="right/Asia/Krasnoyarsk" value="KRAT-7" />
 	<zone name="right/Asia/Kuala_Lumpur" value="MYT-8" />
 	<zone name="right/Asia/Kuching" value="MYT-8" />
 	<zone name="right/Asia/Kuwait" value="AST-3" />
 	<zone name="right/Asia/Macao" value="CST-8" />
 	<zone name="right/Asia/Macau" value="CST-8" />
-	<zone name="right/Asia/Magadan" value="MAGT-12" />
+	<zone name="right/Asia/Magadan" value="MAGT-10" />
 	<zone name="right/Asia/Makassar" value="WITA-8" />
 	<zone name="right/Asia/Manila" value="PHT-8" />
 	<zone name="right/Asia/Muscat" value="GST-4" />
 	<zone name="right/Asia/Nicosia" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="right/Asia/Novokuznetsk" value="NOVT-7" />
-	<zone name="right/Asia/Novosibirsk" value="NOVT-7" />
-	<zone name="right/Asia/Omsk" value="OMST-7" />
+	<zone name="right/Asia/Novokuznetsk" value="KRAT-7" />
+	<zone name="right/Asia/Novosibirsk" value="NOVT-6" />
+	<zone name="right/Asia/Omsk" value="OMST-6" />
 	<zone name="right/Asia/Oral" value="ORAT-5" />
 	<zone name="right/Asia/Phnom_Penh" value="ICT-7" />
 	<zone name="right/Asia/Pontianak" value="WIB-7" />
-	<zone name="right/Asia/Pyongyang" value="KST-9" />
+	<zone name="right/Asia/Pyongyang" value="KST-8:30" />
 	<zone name="right/Asia/Qatar" value="AST-3" />
 	<zone name="right/Asia/Qyzylorda" value="QYZT-6" />
 	<zone name="right/Asia/Rangoon" value="MMT-6:30" />
 	<zone name="right/Asia/Riyadh" value="AST-3" />
 	<zone name="right/Asia/Saigon" value="ICT-7" />
-	<zone name="right/Asia/Sakhalin" value="SAKT-11" />
+	<zone name="right/Asia/Sakhalin" value="SAKT-10" />
 	<zone name="right/Asia/Samarkand" value="UZT-5" />
 	<zone name="right/Asia/Seoul" value="KST-9" />
 	<zone name="right/Asia/Shanghai" value="CST-8" />
 	<zone name="right/Asia/Singapore" value="SGT-8" />
+	<zone name="right/Asia/Srednekolymsk" value="SRET-11" />
 	<zone name="right/Asia/Taipei" value="CST-8" />
 	<zone name="right/Asia/Tashkent" value="UZT-5" />
 	<zone name="right/Asia/Tbilisi" value="GET-4" />
@@ -1566,14 +1545,14 @@
 	<zone name="right/Asia/Thimphu" value="BTT-6" />
 	<zone name="right/Asia/Tokyo" value="JST-9" />
 	<zone name="right/Asia/Ujung_Pandang" value="WITA-8" />
-	<zone name="right/Asia/Ulaanbaatar" value="ULAT-8" />
-	<zone name="right/Asia/Ulan_Bator" value="ULAT-8" />
-	<zone name="right/Asia/Urumqi" value="CST-8" />
-	<zone name="right/Asia/Ust-Nera" value="VLAT-11" />
+	<zone name="right/Asia/Ulaanbaatar" value="ULAT-8ULAST,M3.5.6,M9.5.6/0" />
+	<zone name="right/Asia/Ulan_Bator" value="ULAT-8ULAST,M3.5.6,M9.5.6/0" />
+	<zone name="right/Asia/Urumqi" value="XJT-6" />
+	<zone name="right/Asia/Ust-Nera" value="VLAT-10" />
 	<zone name="right/Asia/Vientiane" value="ICT-7" />
-	<zone name="right/Asia/Vladivostok" value="VLAT-11" />
-	<zone name="right/Asia/Yakutsk" value="YAKT-10" />
-	<zone name="right/Asia/Yekaterinburg" value="YEKT-6" />
+	<zone name="right/Asia/Vladivostok" value="VLAT-10" />
+	<zone name="right/Asia/Yakutsk" value="YAKT-9" />
+	<zone name="right/Asia/Yekaterinburg" value="YEKT-5" />
 	<zone name="right/Asia/Yerevan" value="AMT-4" />
 	<zone name="right/Atlantic/Azores" value="AZOT1AZOST,M3.5.0/0,M10.5.0/1" />
 	<zone name="right/Atlantic/Bermuda" value="AST4ADT,M3.2.0,M11.1.0" />
@@ -1587,29 +1566,29 @@
 	<zone name="right/Atlantic/South_Georgia" value="GST2" />
 	<zone name="right/Atlantic/St_Helena" value="GMT0" />
 	<zone name="right/Atlantic/Stanley" value="FKST3" />
-	<zone name="right/Australia/ACT" value="EST-10EST,M10.1.0,M4.1.0/3" />
-	<zone name="right/Australia/Adelaide" value="CST-9:30CST,M10.1.0,M4.1.0/3" />
-	<zone name="right/Australia/Brisbane" value="EST-10" />
-	<zone name="right/Australia/Broken_Hill" value="CST-9:30CST,M10.1.0,M4.1.0/3" />
-	<zone name="right/Australia/Canberra" value="EST-10EST,M10.1.0,M4.1.0/3" />
-	<zone name="right/Australia/Currie" value="EST-10EST,M10.1.0,M4.1.0/3" />
-	<zone name="right/Australia/Darwin" value="CST-9:30" />
-	<zone name="right/Australia/Eucla" value="CWST-8:45" />
-	<zone name="right/Australia/Hobart" value="EST-10EST,M10.1.0,M4.1.0/3" />
-	<zone name="right/Australia/LHI" value="LHST-10:30LHST-11,M10.1.0,M4.1.0" />
-	<zone name="right/Australia/Lindeman" value="EST-10" />
-	<zone name="right/Australia/Lord_Howe" value="LHST-10:30LHST-11,M10.1.0,M4.1.0" />
-	<zone name="right/Australia/Melbourne" value="EST-10EST,M10.1.0,M4.1.0/3" />
-	<zone name="right/Australia/NSW" value="EST-10EST,M10.1.0,M4.1.0/3" />
-	<zone name="right/Australia/North" value="CST-9:30" />
-	<zone name="right/Australia/Perth" value="WST-8" />
-	<zone name="right/Australia/Queensland" value="EST-10" />
-	<zone name="right/Australia/South" value="CST-9:30CST,M10.1.0,M4.1.0/3" />
-	<zone name="right/Australia/Sydney" value="EST-10EST,M10.1.0,M4.1.0/3" />
-	<zone name="right/Australia/Tasmania" value="EST-10EST,M10.1.0,M4.1.0/3" />
-	<zone name="right/Australia/Victoria" value="EST-10EST,M10.1.0,M4.1.0/3" />
-	<zone name="right/Australia/West" value="WST-8" />
-	<zone name="right/Australia/Yancowinna" value="CST-9:30CST,M10.1.0,M4.1.0/3" />
+	<zone name="right/Australia/ACT" value="AEST-10AEDT,M10.1.0,M4.1.0/3" />
+	<zone name="right/Australia/Adelaide" value="ACST-9:30ACDT,M10.1.0,M4.1.0/3" />
+	<zone name="right/Australia/Brisbane" value="AEST-10" />
+	<zone name="right/Australia/Broken_Hill" value="ACST-9:30ACDT,M10.1.0,M4.1.0/3" />
+	<zone name="right/Australia/Canberra" value="AEST-10AEDT,M10.1.0,M4.1.0/3" />
+	<zone name="right/Australia/Currie" value="AEST-10AEDT,M10.1.0,M4.1.0/3" />
+	<zone name="right/Australia/Darwin" value="ACST-9:30" />
+	<zone name="right/Australia/Eucla" value="ACWST-8:45" />
+	<zone name="right/Australia/Hobart" value="AEST-10AEDT,M10.1.0,M4.1.0/3" />
+	<zone name="right/Australia/LHI" value="LHST-10:30LHDT-11,M10.1.0,M4.1.0" />
+	<zone name="right/Australia/Lindeman" value="AEST-10" />
+	<zone name="right/Australia/Lord_Howe" value="LHST-10:30LHDT-11,M10.1.0,M4.1.0" />
+	<zone name="right/Australia/Melbourne" value="AEST-10AEDT,M10.1.0,M4.1.0/3" />
+	<zone name="right/Australia/NSW" value="AEST-10AEDT,M10.1.0,M4.1.0/3" />
+	<zone name="right/Australia/North" value="ACST-9:30" />
+	<zone name="right/Australia/Perth" value="AWST-8" />
+	<zone name="right/Australia/Queensland" value="AEST-10" />
+	<zone name="right/Australia/South" value="ACST-9:30ACDT,M10.1.0,M4.1.0/3" />
+	<zone name="right/Australia/Sydney" value="AEST-10AEDT,M10.1.0,M4.1.0/3" />
+	<zone name="right/Australia/Tasmania" value="AEST-10AEDT,M10.1.0,M4.1.0/3" />
+	<zone name="right/Australia/Victoria" value="AEST-10AEDT,M10.1.0,M4.1.0/3" />
+	<zone name="right/Australia/West" value="AWST-8" />
+	<zone name="right/Australia/Yancowinna" value="ACST-9:30ACDT,M10.1.0,M4.1.0/3" />
 	<zone name="right/Brazil/Acre" value="ACT5" />
 	<zone name="right/Brazil/DeNoronha" value="FNT2" />
 	<zone name="right/Brazil/East" value="BRT3BRST,M10.3.0/0,M2.3.0/0" />
@@ -1625,43 +1604,43 @@
 	<zone name="right/Canada/Pacific" value="PST8PDT,M3.2.0,M11.1.0" />
 	<zone name="right/Canada/Saskatchewan" value="CST6" />
 	<zone name="right/Canada/Yukon" value="PST8PDT,M3.2.0,M11.1.0" />
-	<zone name="right/Chile/Continental" value="CLST" />
-	<zone name="right/Chile/EasterIsland" value="EASST" />
+	<zone name="right/Chile/Continental" value="CLT3" />
+	<zone name="right/Chile/EasterIsland" value="EAST5" />
 	<zone name="right/Cuba" value="CST5CDT,M3.2.0/0,M11.1.0/1" />
 	<zone name="right/EET" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
 	<zone name="right/EST" value="EST5" />
 	<zone name="right/EST5EDT" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="right/Egypt" value="EEST" />
+	<zone name="right/Egypt" value="EET-2" />
 	<zone name="right/Eire" value="GMT0IST,M3.5.0/1,M10.5.0" />
 	<zone name="right/Etc/GMT" value="GMT0" />
 	<zone name="right/Etc/GMT+0" value="GMT0" />
-	<zone name="right/Etc/GMT+1" value="<GMT+1>1" />
-	<zone name="right/Etc/GMT+10" value="<GMT+10>10" />
-	<zone name="right/Etc/GMT+11" value="<GMT+11>11" />
-	<zone name="right/Etc/GMT+12" value="<GMT+12>12" />
-	<zone name="right/Etc/GMT+2" value="<GMT+2>2" />
-	<zone name="right/Etc/GMT+3" value="<GMT+3>3" />
-	<zone name="right/Etc/GMT+4" value="<GMT+4>4" />
-	<zone name="right/Etc/GMT+5" value="<GMT+5>5" />
-	<zone name="right/Etc/GMT+6" value="<GMT+6>6" />
-	<zone name="right/Etc/GMT+7" value="<GMT+7>7" />
-	<zone name="right/Etc/GMT+8" value="<GMT+8>8" />
-	<zone name="right/Etc/GMT+9" value="<GMT+9>9" />
+	<zone name="right/Etc/GMT+1" value="&lt;GMT+1&gt;1" />
+	<zone name="right/Etc/GMT+10" value="&lt;GMT+10&gt;10" />
+	<zone name="right/Etc/GMT+11" value="&lt;GMT+11&gt;11" />
+	<zone name="right/Etc/GMT+12" value="&lt;GMT+12&gt;12" />
+	<zone name="right/Etc/GMT+2" value="&lt;GMT+2&gt;2" />
+	<zone name="right/Etc/GMT+3" value="&lt;GMT+3&gt;3" />
+	<zone name="right/Etc/GMT+4" value="&lt;GMT+4&gt;4" />
+	<zone name="right/Etc/GMT+5" value="&lt;GMT+5&gt;5" />
+	<zone name="right/Etc/GMT+6" value="&lt;GMT+6&gt;6" />
+	<zone name="right/Etc/GMT+7" value="&lt;GMT+7&gt;7" />
+	<zone name="right/Etc/GMT+8" value="&lt;GMT+8&gt;8" />
+	<zone name="right/Etc/GMT+9" value="&lt;GMT+9&gt;9" />
 	<zone name="right/Etc/GMT-0" value="GMT0" />
-	<zone name="right/Etc/GMT-1" value="<GMT-1>-1" />
-	<zone name="right/Etc/GMT-10" value="<GMT-10>-10" />
-	<zone name="right/Etc/GMT-11" value="<GMT-11>-11" />
-	<zone name="right/Etc/GMT-12" value="<GMT-12>-12" />
-	<zone name="right/Etc/GMT-13" value="<GMT-13>-13" />
-	<zone name="right/Etc/GMT-14" value="<GMT-14>-14" />
-	<zone name="right/Etc/GMT-2" value="<GMT-2>-2" />
-	<zone name="right/Etc/GMT-3" value="<GMT-3>-3" />
-	<zone name="right/Etc/GMT-4" value="<GMT-4>-4" />
-	<zone name="right/Etc/GMT-5" value="<GMT-5>-5" />
-	<zone name="right/Etc/GMT-6" value="<GMT-6>-6" />
-	<zone name="right/Etc/GMT-7" value="<GMT-7>-7" />
-	<zone name="right/Etc/GMT-8" value="<GMT-8>-8" />
-	<zone name="right/Etc/GMT-9" value="<GMT-9>-9" />
+	<zone name="right/Etc/GMT-1" value="&lt;GMT-1&gt;-1" />
+	<zone name="right/Etc/GMT-10" value="&lt;GMT-10&gt;-10" />
+	<zone name="right/Etc/GMT-11" value="&lt;GMT-11&gt;-11" />
+	<zone name="right/Etc/GMT-12" value="&lt;GMT-12&gt;-12" />
+	<zone name="right/Etc/GMT-13" value="&lt;GMT-13&gt;-13" />
+	<zone name="right/Etc/GMT-14" value="&lt;GMT-14&gt;-14" />
+	<zone name="right/Etc/GMT-2" value="&lt;GMT-2&gt;-2" />
+	<zone name="right/Etc/GMT-3" value="&lt;GMT-3&gt;-3" />
+	<zone name="right/Etc/GMT-4" value="&lt;GMT-4&gt;-4" />
+	<zone name="right/Etc/GMT-5" value="&lt;GMT-5&gt;-5" />
+	<zone name="right/Etc/GMT-6" value="&lt;GMT-6&gt;-6" />
+	<zone name="right/Etc/GMT-7" value="&lt;GMT-7&gt;-7" />
+	<zone name="right/Etc/GMT-8" value="&lt;GMT-8&gt;-8" />
+	<zone name="right/Etc/GMT-9" value="&lt;GMT-9&gt;-9" />
 	<zone name="right/Etc/GMT0" value="GMT0" />
 	<zone name="right/Etc/Greenwich" value="GMT0" />
 	<zone name="right/Etc/UCT" value="UCT0" />
@@ -1679,7 +1658,7 @@
 	<zone name="right/Europe/Bucharest" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
 	<zone name="right/Europe/Budapest" value="CET-1CEST,M3.5.0,M10.5.0/3" />
 	<zone name="right/Europe/Busingen" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="right/Europe/Chisinau" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
+	<zone name="right/Europe/Chisinau" value="EET-2EEST,M3.5.0,M10.5.0/3" />
 	<zone name="right/Europe/Copenhagen" value="CET-1CEST,M3.5.0,M10.5.0/3" />
 	<zone name="right/Europe/Dublin" value="GMT0IST,M3.5.0/1,M10.5.0" />
 	<zone name="right/Europe/Gibraltar" value="CET-1CEST,M3.5.0,M10.5.0/3" />
@@ -1688,7 +1667,7 @@
 	<zone name="right/Europe/Isle_of_Man" value="GMT0BST,M3.5.0/1,M10.5.0" />
 	<zone name="right/Europe/Istanbul" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
 	<zone name="right/Europe/Jersey" value="GMT0BST,M3.5.0/1,M10.5.0" />
-	<zone name="right/Europe/Kaliningrad" value="FET-3" />
+	<zone name="right/Europe/Kaliningrad" value="EET-2" />
 	<zone name="right/Europe/Kiev" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
 	<zone name="right/Europe/Lisbon" value="WET0WEST,M3.5.0/1,M10.5.0" />
 	<zone name="right/Europe/Ljubljana" value="CET-1CEST,M3.5.0,M10.5.0/3" />
@@ -1697,9 +1676,9 @@
 	<zone name="right/Europe/Madrid" value="CET-1CEST,M3.5.0,M10.5.0/3" />
 	<zone name="right/Europe/Malta" value="CET-1CEST,M3.5.0,M10.5.0/3" />
 	<zone name="right/Europe/Mariehamn" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="right/Europe/Minsk" value="FET-3" />
+	<zone name="right/Europe/Minsk" value="MSK-3" />
 	<zone name="right/Europe/Monaco" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="right/Europe/Moscow" value="MSK-4" />
+	<zone name="right/Europe/Moscow" value="MSK-3" />
 	<zone name="right/Europe/Nicosia" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
 	<zone name="right/Europe/Oslo" value="CET-1CEST,M3.5.0,M10.5.0/3" />
 	<zone name="right/Europe/Paris" value="CET-1CEST,M3.5.0,M10.5.0/3" />
@@ -1710,24 +1689,23 @@
 	<zone name="right/Europe/Samara" value="SAMT-4" />
 	<zone name="right/Europe/San_Marino" value="CET-1CEST,M3.5.0,M10.5.0/3" />
 	<zone name="right/Europe/Sarajevo" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="right/Europe/Simferopol" value="MSK-4" />
+	<zone name="right/Europe/Simferopol" value="MSK-3" />
 	<zone name="right/Europe/Skopje" value="CET-1CEST,M3.5.0,M10.5.0/3" />
 	<zone name="right/Europe/Sofia" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
 	<zone name="right/Europe/Stockholm" value="CET-1CEST,M3.5.0,M10.5.0/3" />
 	<zone name="right/Europe/Tallinn" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
 	<zone name="right/Europe/Tirane" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="right/Europe/Tiraspol" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
+	<zone name="right/Europe/Tiraspol" value="EET-2EEST,M3.5.0,M10.5.0/3" />
 	<zone name="right/Europe/Uzhgorod" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
 	<zone name="right/Europe/Vaduz" value="CET-1CEST,M3.5.0,M10.5.0/3" />
 	<zone name="right/Europe/Vatican" value="CET-1CEST,M3.5.0,M10.5.0/3" />
 	<zone name="right/Europe/Vienna" value="CET-1CEST,M3.5.0,M10.5.0/3" />
 	<zone name="right/Europe/Vilnius" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="right/Europe/Volgograd" value="VOLT-4" />
+	<zone name="right/Europe/Volgograd" value="MSK-3" />
 	<zone name="right/Europe/Warsaw" value="CET-1CEST,M3.5.0,M10.5.0/3" />
 	<zone name="right/Europe/Zagreb" value="CET-1CEST,M3.5.0,M10.5.0/3" />
 	<zone name="right/Europe/Zaporozhye" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
 	<zone name="right/Europe/Zurich" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="right/Factory" value="<Local time zone must be set--see zic manual page>0" />
 	<zone name="right/GB" value="GMT0BST,M3.5.0/1,M10.5.0" />
 	<zone name="right/GB-Eire" value="GMT0BST,M3.5.0/1,M10.5.0" />
 	<zone name="right/GMT" value="GMT0" />
@@ -1766,15 +1744,16 @@
 	<zone name="right/Navajo" value="MST7MDT,M3.2.0,M11.1.0" />
 	<zone name="right/PRC" value="CST-8" />
 	<zone name="right/PST8PDT" value="PST8PDT,M3.2.0,M11.1.0" />
-	<zone name="right/Pacific/Apia" value="WST-13WSDT,M9.5.0/3,M4.1.0/4" />
+	<zone name="right/Pacific/Apia" value="WSST-13WSDT,M9.5.0/3,M4.1.0/4" />
 	<zone name="right/Pacific/Auckland" value="NZST-12NZDT,M9.5.0,M4.1.0/3" />
+	<zone name="right/Pacific/Bougainville" value="BST-11" />
 	<zone name="right/Pacific/Chatham" value="CHAST-12:45CHADT,M9.5.0/2:45,M4.1.0/3:45" />
 	<zone name="right/Pacific/Chuuk" value="CHUT-10" />
-	<zone name="right/Pacific/Easter" value="EASST" />
+	<zone name="right/Pacific/Easter" value="EAST5" />
 	<zone name="right/Pacific/Efate" value="VUT-11" />
 	<zone name="right/Pacific/Enderbury" value="PHOT-13" />
 	<zone name="right/Pacific/Fakaofo" value="TKT-13" />
-	<zone name="right/Pacific/Fiji" value="FJST" />
+	<zone name="right/Pacific/Fiji" value="FJT-12FJST,M11.1.0,M1.3.0/3" />
 	<zone name="right/Pacific/Funafuti" value="TVT-12" />
 	<zone name="right/Pacific/Galapagos" value="GALT6" />
 	<zone name="right/Pacific/Gambier" value="GAMT9" />
@@ -1790,7 +1769,7 @@
 	<zone name="right/Pacific/Midway" value="SST11" />
 	<zone name="right/Pacific/Nauru" value="NRT-12" />
 	<zone name="right/Pacific/Niue" value="NUT11" />
-	<zone name="right/Pacific/Norfolk" value="NFT-11:30" />
+	<zone name="right/Pacific/Norfolk" value="NFT-11" />
 	<zone name="right/Pacific/Noumea" value="NCT-11" />
 	<zone name="right/Pacific/Pago_Pago" value="SST11" />
 	<zone name="right/Pacific/Palau" value="PWT-9" />
@@ -1813,23 +1792,10 @@
 	<zone name="right/ROC" value="CST-8" />
 	<zone name="right/ROK" value="KST-9" />
 	<zone name="right/Singapore" value="SGT-8" />
-	<zone name="right/SystemV/AST4" value="AST4" />
-	<zone name="right/SystemV/AST4ADT" value="AST4ADT,M3.2.0,M11.1.0" />
-	<zone name="right/SystemV/CST6" value="CST6" />
-	<zone name="right/SystemV/CST6CDT" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="right/SystemV/EST5" value="EST5" />
-	<zone name="right/SystemV/EST5EDT" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="right/SystemV/HST10" value="HST10" />
-	<zone name="right/SystemV/MST7" value="MST7" />
-	<zone name="right/SystemV/MST7MDT" value="MST7MDT,M3.2.0,M11.1.0" />
-	<zone name="right/SystemV/PST8" value="PST8" />
-	<zone name="right/SystemV/PST8PDT" value="PST8PDT,M3.2.0,M11.1.0" />
-	<zone name="right/SystemV/YST9" value="GAMT9" />
-	<zone name="right/SystemV/YST9YDT" value="AKST9AKDT,M3.2.0,M11.1.0" />
 	<zone name="right/Turkey" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
 	<zone name="right/UCT" value="UCT0" />
 	<zone name="right/US/Alaska" value="AKST9AKDT,M3.2.0,M11.1.0" />
-	<zone name="right/US/Aleutian" value="HAST10HADT,M3.2.0,M11.1.0" />
+	<zone name="right/US/Aleutian" value="HST10HDT,M3.2.0,M11.1.0" />
 	<zone name="right/US/Arizona" value="MST7" />
 	<zone name="right/US/Central" value="CST6CDT,M3.2.0,M11.1.0" />
 	<zone name="right/US/East-Indiana" value="EST5EDT,M3.2.0,M11.1.0" />
@@ -1843,7 +1809,7 @@
 	<zone name="right/US/Samoa" value="SST11" />
 	<zone name="right/UTC" value="UTC0" />
 	<zone name="right/Universal" value="UTC0" />
-	<zone name="right/W-SU" value="MSK-4" />
+	<zone name="right/W-SU" value="MSK-3" />
 	<zone name="right/WET" value="WET0WEST,M3.5.0/1,M10.5.0" />
 	<zone name="right/Zulu" value="UTC0" />
     </timezones>
diff --git a/scripts/perl/timezone-gen.pl b/scripts/perl/timezone-gen.pl
index 6127005062..e812023ef0 100755
--- a/scripts/perl/timezone-gen.pl
+++ b/scripts/perl/timezone-gen.pl
@@ -2,6 +2,9 @@
 
 use strict;
 use Getopt::Long;
+use XML::Entities;
+use HTML::Entities;
+
 
 my $base   = "/usr/share/zoneinfo";
 my $output = "timezones.conf.xml";
@@ -70,7 +73,7 @@ print $out " " x 4, "<timezones>\n";
 
 my $lastprefix = "";
 foreach my $zone ( sort( keys(%zones) ) ) {
-    my $str = $zones{$zone};
+    my $str = encode_entities($zones{$zone});
     next if ( !$str );
 
     my $newprefix = $zone;