diff --git a/std/datetime.d b/std/datetime.d
index f8c2d499d71..8347968d4d3 100644
--- a/std/datetime.d
+++ b/std/datetime.d
@@ -29428,6 +29428,10 @@ string windowsTZNameToTZDatabaseName(string tzName) @safe pure nothrow @nogc
         case "Dateline Standard Time": return "Etc/GMT+12";
         case "E. Africa Standard Time": return "Africa/Nairobi";
         case "E. Australia Standard Time": return "Australia/Brisbane";
+        // This doesn't appear to be in the current stuff from MS, but the autotester
+        // is failing without it (probably because its time zone data hasn't been
+        // updated recently enough).
+        case "E. Europe Standard Time": return "Europe/Minsk";
         case "E. South America Standard Time": return "America/Sao_Paulo";
         case "Eastern Standard Time": return "America/New_York";
         case "Egypt Standard Time": return "Africa/Cairo";
@@ -29445,11 +29449,19 @@ string windowsTZNameToTZDatabaseName(string tzName) @safe pure nothrow @nogc
         case "Israel Standard Time": return "Asia/Jerusalem";
         case "Jordan Standard Time": return "Asia/Amman";
         case "Kaliningrad Standard Time": return "Europe/Kaliningrad";
+        // Same as with E. Europe Standard Time.
+        case "Kamchatka Standard Time": return "Asia/Kamchatka";
         case "Korea Standard Time": return "Asia/Seoul";
         case "Libya Standard Time": return "Africa/Tripoli";
         case "Line Islands Standard Time": return "Pacific/Kiritimati";
         case "Magadan Standard Time": return "Asia/Magadan";
         case "Mauritius Standard Time": return "Indian/Mauritius";
+        // Same as with E. Europe Standard Time.
+        case "Mexico Standard Time": return "America/Mexico_City";
+        // Same as with E. Europe Standard Time.
+        case "Mexico Standard Time 2": return "America/Chihuahua";
+       // Same as with E. Europe Standard Time.
+        case "Mid-Atlantic Standard Time": return "Etc/GMT+2";
         case "Middle East Standard Time": return "Asia/Beirut";
         case "Montevideo Standard Time": return "America/Montevideo";
         case "Morocco Standard Time": return "Africa/Casablanca";