diff --git a/modules/base/luasrc/sys/zoneinfo/tzdata.lua b/modules/base/luasrc/sys/zoneinfo/tzdata.lua
index b604f6b65e44e6dcfbee0c1b58a3bb77512f2921..1efe6dd9fa5f4716908678e5b57a97cdf294490f 100644
--- a/modules/base/luasrc/sys/zoneinfo/tzdata.lua
+++ b/modules/base/luasrc/sys/zoneinfo/tzdata.lua
@@ -105,6 +105,7 @@ TZ = {
 	{ 'America/Edmonton', 'MST7MDT,M3.2.0,M11.1.0' },
 	{ 'America/Eirunepe', 'ACT5' },
 	{ 'America/El Salvador', 'CST6' },
+	{ 'America/Fort Nelson', 'MST7' },
 	{ 'America/Fortaleza', 'BRT3' },
 	{ 'America/Glace Bay', 'AST4ADT,M3.2.0,M11.1.0' },
 	{ 'America/Godthab', 'WGT3WGST,M3.5.0/-2,M10.5.0/-1' },
@@ -146,12 +147,12 @@ TZ = {
 	{ 'America/Mazatlan', 'MST7MDT,M4.1.0,M10.5.0' },
 	{ 'America/Menominee', 'CST6CDT,M3.2.0,M11.1.0' },
 	{ 'America/Merida', 'CST6CDT,M4.1.0,M10.5.0' },
-	{ 'America/Metlakatla', 'PST8' },
+	{ 'America/Metlakatla', 'AKST9AKDT,M3.2.0,M11.1.0' },
 	{ 'America/Mexico City', 'CST6CDT,M4.1.0,M10.5.0' },
 	{ 'America/Miquelon', 'PMST3PMDT,M3.2.0,M11.1.0' },
 	{ 'America/Moncton', 'AST4ADT,M3.2.0,M11.1.0' },
 	{ 'America/Monterrey', 'CST6CDT,M4.1.0,M10.5.0' },
-	{ 'America/Montevideo', 'UYT3UYST,M10.1.0,M3.2.0' },
+	{ 'America/Montevideo', 'UYT3' },
 	{ 'America/Montserrat', 'AST4' },
 	{ 'America/Nassau', 'EST5EDT,M3.2.0,M11.1.0' },
 	{ 'America/New York', 'EST5EDT,M3.2.0,M11.1.0' },
@@ -176,7 +177,6 @@ TZ = {
 	{ 'America/Regina', 'CST6' },
 	{ 'America/Resolute', 'CST6CDT,M3.2.0,M11.1.0' },
 	{ 'America/Rio Branco', 'ACT5' },
-	{ 'America/Santa Isabel', 'PST8PDT,M4.1.0,M10.5.0' },
 	{ 'America/Santarem', 'BRT3' },
 	{ 'America/Santiago', 'CLT3' },
 	{ 'America/Santo Domingo', 'AST4' },
@@ -227,7 +227,7 @@ TZ = {
 	{ 'Asia/Beirut', 'EET-2EEST,M3.5.0/0,M10.5.0/0' },
 	{ 'Asia/Bishkek', 'KGT-6' },
 	{ 'Asia/Brunei', 'BNT-8' },
-	{ 'Asia/Chita', 'IRKT-8' },
+	{ 'Asia/Chita', 'YAKT-9' },
 	{ 'Asia/Choibalsan', 'CHOT-8CHOST,M3.5.6,M9.5.6/0' },
 	{ 'Asia/Colombo', 'IST-5:30' },
 	{ 'Asia/Damascus', 'EET-2EEST,M3.5.5/0,M10.5.5/0' },
@@ -266,7 +266,7 @@ TZ = {
 	{ 'Asia/Oral', 'ORAT-5' },
 	{ 'Asia/Phnom Penh', 'ICT-7' },
 	{ 'Asia/Pontianak', 'WIB-7' },
-	{ 'Asia/Pyongyang', 'KST-9' },
+	{ 'Asia/Pyongyang', 'KST-8:30' },
 	{ 'Asia/Qatar', 'AST-3' },
 	{ 'Asia/Qyzylorda', 'QYZT-6' },
 	{ 'Asia/Rangoon', 'MMT-6:30' },
@@ -280,6 +280,7 @@ TZ = {
 	{ 'Asia/Taipei', 'CST-8' },
 	{ 'Asia/Tashkent', 'UZT-5' },
 	{ 'Asia/Tbilisi', 'GET-4' },
+	{ 'Asia/Tehran', 'IRST-3:30IRDT,J80/0,J264/0' },
 	{ 'Asia/Thimphu', 'BTT-6' },
 	{ 'Asia/Tokyo', 'JST-9' },
 	{ 'Asia/Ulaanbaatar', 'ULAT-8ULAST,M3.5.6,M9.5.6/0' },
@@ -322,7 +323,7 @@ TZ = {
 	{ 'Europe/Bucharest', 'EET-2EEST,M3.5.0/3,M10.5.0/4' },
 	{ 'Europe/Budapest', 'CET-1CEST,M3.5.0,M10.5.0/3' },
 	{ 'Europe/Busingen', 'CET-1CEST,M3.5.0,M10.5.0/3' },
-	{ 'Europe/Chisinau', 'EET-2EEST,M3.5.0/3,M10.5.0/4' },
+	{ 'Europe/Chisinau', 'EET-2EEST,M3.5.0,M10.5.0/3' },
 	{ 'Europe/Copenhagen', 'CET-1CEST,M3.5.0,M10.5.0/3' },
 	{ 'Europe/Dublin', 'GMT0IST,M3.5.0/1,M10.5.0' },
 	{ 'Europe/Gibraltar', 'CET-1CEST,M3.5.0,M10.5.0/3' },
@@ -388,7 +389,7 @@ TZ = {
 	{ 'Pacific/Efate', 'VUT-11' },
 	{ 'Pacific/Enderbury', 'PHOT-13' },
 	{ 'Pacific/Fakaofo', 'TKT-13' },
-	{ 'Pacific/Fiji', 'FJT-12FJST,M11.1.0,M1.3.4/75' },
+	{ 'Pacific/Fiji', 'FJT-12FJST,M11.1.0,M1.3.0/3' },
 	{ 'Pacific/Funafuti', 'TVT-12' },
 	{ 'Pacific/Galapagos', 'GALT6' },
 	{ 'Pacific/Gambier', 'GAMT9' },
@@ -404,7 +405,7 @@ TZ = {
 	{ 'Pacific/Midway', 'SST11' },
 	{ 'Pacific/Nauru', 'NRT-12' },
 	{ 'Pacific/Niue', 'NUT11' },
-	{ 'Pacific/Norfolk', 'NFT-11:30' },
+	{ 'Pacific/Norfolk', 'NFT-11' },
 	{ 'Pacific/Noumea', 'NCT-11' },
 	{ 'Pacific/Pago Pago', 'SST11' },
 	{ 'Pacific/Palau', 'PWT-9' },
diff --git a/modules/base/luasrc/sys/zoneinfo/tzoffset.lua b/modules/base/luasrc/sys/zoneinfo/tzoffset.lua
index 24429ac36bb2a07b5a5191350d3c9d4078e26940..351ebccd38eb55a717985467d18782e78e598a0b 100644
--- a/modules/base/luasrc/sys/zoneinfo/tzoffset.lua
+++ b/modules/base/luasrc/sys/zoneinfo/tzoffset.lua
@@ -41,7 +41,6 @@ OFFSET = {
 	pmst  = -10800,	-- PMST
 	pmdt  =  -7200,	-- PMDT
 	uyt   = -10800,	-- UYT
-	uyst  =  -7200,	-- UYST
 	fnt   =  -7200,	-- FNT
 	srt   = -10800,	-- SRT
 	clt   = -10800,	-- CLT
@@ -69,7 +68,7 @@ OFFSET = {
 	ict   =  25200,	-- ICT
 	kgt   =  21600,	-- KGT
 	bnt   =  28800,	-- BNT
-	irkt  =  28800,	-- IRKT
+	yakt  =  32400,	-- YAKT
 	chot  =  28800,	-- CHOT
 	chost =  32400,	-- CHOST
 	ist   =  19800,	-- IST
@@ -80,13 +79,13 @@ OFFSET = {
 	hkt   =  28800,	-- HKT
 	hovt  =  25200,	-- HOVT
 	hovst =  28800,	-- HOVST
+	irkt  =  28800,	-- IRKT
 	wib   =  25200,	-- WIB
 	wit   =  32400,	-- WIT
 	aft   =  16200,	-- AFT
 	pett  =  43200,	-- PETT
 	pkt   =  18000,	-- PKT
 	npt   =  20700,	-- NPT
-	yakt  =  32400,	-- YAKT
 	krat  =  25200,	-- KRAT
 	myt   =  28800,	-- MYT
 	magt  =  36000,	-- MAGT
@@ -95,7 +94,7 @@ OFFSET = {
 	novt  =  21600,	-- NOVT
 	omst  =  21600,	-- OMST
 	orat  =  18000,	-- ORAT
-	kst   =  32400,	-- KST
+	kst   =  30600,	-- KST
 	qyzt  =  21600,	-- QYZT
 	mmt   =  23400,	-- MMT
 	sakt  =  36000,	-- SAKT
@@ -103,6 +102,8 @@ OFFSET = {
 	sgt   =  28800,	-- SGT
 	sret  =  39600,	-- SRET
 	get   =  14400,	-- GET
+	irst  =  12600,	-- IRST
+	irdt  =  16200,	-- IRDT
 	btt   =  21600,	-- BTT
 	jst   =  32400,	-- JST
 	ulat  =  28800,	-- ULAT
@@ -153,7 +154,7 @@ OFFSET = {
 	sst   = -39600,	-- SST
 	nrt   =  43200,	-- NRT
 	nut   = -39600,	-- NUT
-	nft   =  41400,	-- NFT
+	nft   =  39600,	-- NFT
 	nct   =  39600,	-- NCT
 	pwt   =  32400,	-- PWT
 	pont  =  39600,	-- PONT