diff --git a/src/time/zoneinfo_abbrs_windows.go b/src/time/zoneinfo_abbrs_windows.go
index 3294d0d..139bda1 100644
--- a/src/time/zoneinfo_abbrs_windows.go
+++ b/src/time/zoneinfo_abbrs_windows.go
@@ -16,10 +16,11 @@
 	"Egypt Standard Time":             {"EET", "EET"},     // Africa/Cairo
 	"Morocco Standard Time":           {"+00", "+01"},     // Africa/Casablanca
 	"South Africa Standard Time":      {"SAST", "SAST"},   // Africa/Johannesburg
+	"South Sudan Standard Time":       {"CAT", "CAT"},     // Africa/Juba
 	"Sudan Standard Time":             {"CAT", "CAT"},     // Africa/Khartoum
 	"W. Central Africa Standard Time": {"WAT", "WAT"},     // Africa/Lagos
 	"E. Africa Standard Time":         {"EAT", "EAT"},     // Africa/Nairobi
-	"Sao Tome Standard Time":          {"GMT", "WAT"},     // Africa/Sao_Tome
+	"Sao Tome Standard Time":          {"GMT", "GMT"},     // Africa/Sao_Tome
 	"Libya Standard Time":             {"EET", "EET"},     // Africa/Tripoli
 	"Namibia Standard Time":           {"CAT", "CAT"},     // Africa/Windhoek
 	"Aleutian Standard Time":          {"HST", "HDT"},     // America/Adak
@@ -33,8 +34,8 @@
 	"Venezuela Standard Time":         {"-04", "-04"},     // America/Caracas
 	"SA Eastern Standard Time":        {"-03", "-03"},     // America/Cayenne
 	"Central Standard Time":           {"CST", "CDT"},     // America/Chicago
-	"Mountain Standard Time (Mexico)": {"MST", "MDT"},     // America/Chihuahua
-	"Central Brazilian Standard Time": {"-04", "-03"},     // America/Cuiaba
+	"Mountain Standard Time (Mexico)": {"CST", "CST"},     // America/Chihuahua
+	"Central Brazilian Standard Time": {"-04", "-04"},     // America/Cuiaba
 	"Mountain Standard Time":          {"MST", "MDT"},     // America/Denver
 	"Greenland Standard Time":         {"-03", "-02"},     // America/Godthab
 	"Turks And Caicos Standard Time":  {"EST", "EDT"},     // America/Grand_Turk
@@ -44,7 +45,7 @@
 	"US Eastern Standard Time":        {"EST", "EDT"},     // America/Indianapolis
 	"SA Western Standard Time":        {"-04", "-04"},     // America/La_Paz
 	"Pacific Standard Time":           {"PST", "PDT"},     // America/Los_Angeles
-	"Central Standard Time (Mexico)":  {"CST", "CDT"},     // America/Mexico_City
+	"Central Standard Time (Mexico)":  {"CST", "CST"},     // America/Mexico_City
 	"Saint Pierre Standard Time":      {"-03", "-02"},     // America/Miquelon
 	"Montevideo Standard Time":        {"-03", "-03"},     // America/Montevideo
 	"Eastern Standard Time":           {"EST", "EDT"},     // America/New_York
@@ -53,11 +54,12 @@
 	"Magallanes Standard Time":        {"-03", "-03"},     // America/Punta_Arenas
 	"Canada Central Standard Time":    {"CST", "CST"},     // America/Regina
 	"Pacific SA Standard Time":        {"-04", "-03"},     // America/Santiago
-	"E. South America Standard Time":  {"-03", "-02"},     // America/Sao_Paulo
+	"E. South America Standard Time":  {"-03", "-03"},     // America/Sao_Paulo
 	"Newfoundland Standard Time":      {"NST", "NDT"},     // America/St_Johns
 	"Pacific Standard Time (Mexico)":  {"PST", "PDT"},     // America/Tijuana
+	"Yukon Standard Time":             {"MST", "MST"},     // America/Whitehorse
 	"Central Asia Standard Time":      {"+06", "+06"},     // Asia/Almaty
-	"Jordan Standard Time":            {"EET", "EEST"},    // Asia/Amman
+	"Jordan Standard Time":            {"+03", "+03"},     // Asia/Amman
 	"Arabic Standard Time":            {"+03", "+03"},     // Asia/Baghdad
 	"Azerbaijan Standard Time":        {"+04", "+04"},     // Asia/Baku
 	"SE Asia Standard Time":           {"+07", "+07"},     // Asia/Bangkok
@@ -66,7 +68,7 @@
 	"India Standard Time":             {"IST", "IST"},     // Asia/Calcutta
 	"Transbaikal Standard Time":       {"+09", "+09"},     // Asia/Chita
 	"Sri Lanka Standard Time":         {"+0530", "+0530"}, // Asia/Colombo
-	"Syria Standard Time":             {"EET", "EEST"},    // Asia/Damascus
+	"Syria Standard Time":             {"+03", "+03"},     // Asia/Damascus
 	"Bangladesh Standard Time":        {"+06", "+06"},     // Asia/Dhaka
 	"Arabian Standard Time":           {"+04", "+04"},     // Asia/Dubai
 	"West Bank Standard Time":         {"EET", "EEST"},    // Asia/Hebron
@@ -82,7 +84,7 @@
 	"N. Central Asia Standard Time":   {"+07", "+07"},     // Asia/Novosibirsk
 	"Omsk Standard Time":              {"+06", "+06"},     // Asia/Omsk
 	"North Korea Standard Time":       {"KST", "KST"},     // Asia/Pyongyang
-	"Qyzylorda Standard Time":         {"+05", "+06"},     // Asia/Qyzylorda
+	"Qyzylorda Standard Time":         {"+05", "+05"},     // Asia/Qyzylorda
 	"Myanmar Standard Time":           {"+0630", "+0630"}, // Asia/Rangoon
 	"Arab Standard Time":              {"+03", "+03"},     // Asia/Riyadh
 	"Sakhalin Standard Time":          {"+11", "+11"},     // Asia/Sakhalin
@@ -93,7 +95,7 @@
 	"Taipei Standard Time":            {"CST", "CST"},     // Asia/Taipei
 	"West Asia Standard Time":         {"+05", "+05"},     // Asia/Tashkent
 	"Georgian Standard Time":          {"+04", "+04"},     // Asia/Tbilisi
-	"Iran Standard Time":              {"+0330", "+0430"}, // Asia/Tehran
+	"Iran Standard Time":              {"+0330", "+0330"}, // Asia/Tehran
 	"Tokyo Standard Time":             {"JST", "JST"},     // Asia/Tokyo
 	"Tomsk Standard Time":             {"+07", "+07"},     // Asia/Tomsk
 	"Ulaanbaatar Standard Time":       {"+08", "+08"},     // Asia/Ulaanbaatar
@@ -112,7 +114,6 @@
 	"Lord Howe Standard Time":         {"+1030", "+11"},   // Australia/Lord_Howe
 	"W. Australia Standard Time":      {"AWST", "AWST"},   // Australia/Perth
 	"AUS Eastern Standard Time":       {"AEST", "AEDT"},   // Australia/Sydney
-	"UTC":                             {"GMT", "GMT"},     // Etc/GMT
 	"UTC-11":                          {"-11", "-11"},     // Etc/GMT+11
 	"Dateline Standard Time":          {"-12", "-12"},     // Etc/GMT+12
 	"UTC-02":                          {"-02", "-02"},     // Etc/GMT+2
@@ -120,6 +121,7 @@
 	"UTC-09":                          {"-09", "-09"},     // Etc/GMT+9
 	"UTC+12":                          {"+12", "+12"},     // Etc/GMT-12
 	"UTC+13":                          {"+13", "+13"},     // Etc/GMT-13
+	"UTC":                             {"UTC", "UTC"},     // Etc/UTC
 	"Astrakhan Standard Time":         {"+04", "+04"},     // Europe/Astrakhan
 	"W. Europe Standard Time":         {"CET", "CEST"},    // Europe/Berlin
 	"GTB Standard Time":               {"EET", "EEST"},    // Europe/Bucharest
@@ -134,20 +136,20 @@
 	"Romance Standard Time":           {"CET", "CEST"},    // Europe/Paris
 	"Russia Time Zone 3":              {"+04", "+04"},     // Europe/Samara
 	"Saratov Standard Time":           {"+04", "+04"},     // Europe/Saratov
-	"Volgograd Standard Time":         {"+04", "+04"},     // Europe/Volgograd
+	"Volgograd Standard Time":         {"+03", "+03"},     // Europe/Volgograd
 	"Central European Standard Time":  {"CET", "CEST"},    // Europe/Warsaw
 	"Mauritius Standard Time":         {"+04", "+04"},     // Indian/Mauritius
-	"Samoa Standard Time":             {"+13", "+14"},     // Pacific/Apia
+	"Samoa Standard Time":             {"+13", "+13"},     // Pacific/Apia
 	"New Zealand Standard Time":       {"NZST", "NZDT"},   // Pacific/Auckland
 	"Bougainville Standard Time":      {"+11", "+11"},     // Pacific/Bougainville
 	"Chatham Islands Standard Time":   {"+1245", "+1345"}, // Pacific/Chatham
 	"Easter Island Standard Time":     {"-06", "-05"},     // Pacific/Easter
-	"Fiji Standard Time":              {"+12", "+13"},     // Pacific/Fiji
+	"Fiji Standard Time":              {"+12", "+12"},     // Pacific/Fiji
 	"Central Pacific Standard Time":   {"+11", "+11"},     // Pacific/Guadalcanal
 	"Hawaiian Standard Time":          {"HST", "HST"},     // Pacific/Honolulu
 	"Line Islands Standard Time":      {"+14", "+14"},     // Pacific/Kiritimati
 	"Marquesas Standard Time":         {"-0930", "-0930"}, // Pacific/Marquesas
-	"Norfolk Standard Time":           {"+11", "+11"},     // Pacific/Norfolk
+	"Norfolk Standard Time":           {"+11", "+12"},     // Pacific/Norfolk
 	"West Pacific Standard Time":      {"+10", "+10"},     // Pacific/Port_Moresby
 	"Tonga Standard Time":             {"+13", "+13"},     // Pacific/Tongatapu
 }