diff --git a/zabbix52-agent/distinfo b/zabbix52-agent/distinfo
index 0d6aff1128..e20c8afa30 100644
--- a/zabbix52-agent/distinfo
+++ b/zabbix52-agent/distinfo
@@ -1,9 +1,9 @@
 $NetBSD$
 
-SHA1 (zabbix-5.2.2.tar.gz) = fb59a2ea190e60d1c9ff43101ca9d489e35a3bb5
-RMD160 (zabbix-5.2.2.tar.gz) = 7a21760571f949aa0fca420927e28735a44b75f3
-SHA512 (zabbix-5.2.2.tar.gz) = 7bb79111ff809a90a5911d7f94f86eddec3a3fa4f91fdfbf013178442de81d22dc13359679570b8d62fe41b664c764c42cbe98936fd195521951aab507933d9b
-Size (zabbix-5.2.2.tar.gz) = 19745101 bytes
+SHA1 (zabbix-5.2.3.tar.gz) = 15461b366452aa8743344f4d8534a89d08ce39b8
+RMD160 (zabbix-5.2.3.tar.gz) = 1b62ee4b634ef565770123d0607782764f447d16
+SHA512 (zabbix-5.2.3.tar.gz) = 207d522ab728bb89f6aaf793af94848469210fb257ead34b93e0f7ba7b2a22b4cce65d516dfbb549a36ae873fe6b6d3486c47f11efff8950d3c81570c673ff9e
+Size (zabbix-5.2.3.tar.gz) = 19791383 bytes
 SHA1 (patch-configure) = cf647b9ee52a96882d31f8783ac19b66e3e65105
 SHA1 (patch-src_libs_zbxsysinfo_netbsd_net.c) = 468f2112a3d65b0a73f371194ae15ce0df0ad71c
 SHA1 (patch-src_zabbix__agent_Makefile.in) = efbd804ecee4b99db36db5f4fd61583b2ef96a86
diff --git a/zabbix52-frontend/PLIST b/zabbix52-frontend/PLIST
index 23b448364f..f329efc2ea 100644
--- a/zabbix52-frontend/PLIST
+++ b/zabbix52-frontend/PLIST
@@ -545,6 +545,7 @@ share/zabbix/include/classes/helpers/CConfigGeneralHelper.php
 share/zabbix/include/classes/helpers/CCookieHelper.php
 share/zabbix/include/classes/helpers/CDashboardHelper.php
 share/zabbix/include/classes/helpers/CDataCacheHelper.php
+share/zabbix/include/classes/helpers/CDateTimeZoneHelper.php
 share/zabbix/include/classes/helpers/CElasticsearchHelper.php
 share/zabbix/include/classes/helpers/CEncryptHelper.php
 share/zabbix/include/classes/helpers/CHousekeepingHelper.php
diff --git a/zabbix52-frontend/distinfo b/zabbix52-frontend/distinfo
index 86f2cbda43..282365c057 100644
--- a/zabbix52-frontend/distinfo
+++ b/zabbix52-frontend/distinfo
@@ -1,6 +1,6 @@
 $NetBSD$
 
-SHA1 (zabbix-5.2.2.tar.gz) = fb59a2ea190e60d1c9ff43101ca9d489e35a3bb5
-RMD160 (zabbix-5.2.2.tar.gz) = 7a21760571f949aa0fca420927e28735a44b75f3
-SHA512 (zabbix-5.2.2.tar.gz) = 7bb79111ff809a90a5911d7f94f86eddec3a3fa4f91fdfbf013178442de81d22dc13359679570b8d62fe41b664c764c42cbe98936fd195521951aab507933d9b
-Size (zabbix-5.2.2.tar.gz) = 19745101 bytes
+SHA1 (zabbix-5.2.3.tar.gz) = 15461b366452aa8743344f4d8534a89d08ce39b8
+RMD160 (zabbix-5.2.3.tar.gz) = 1b62ee4b634ef565770123d0607782764f447d16
+SHA512 (zabbix-5.2.3.tar.gz) = 207d522ab728bb89f6aaf793af94848469210fb257ead34b93e0f7ba7b2a22b4cce65d516dfbb549a36ae873fe6b6d3486c47f11efff8950d3c81570c673ff9e
+Size (zabbix-5.2.3.tar.gz) = 19791383 bytes
diff --git a/zabbix52-java/distinfo b/zabbix52-java/distinfo
index 1fc5e323f7..55961f143c 100644
--- a/zabbix52-java/distinfo
+++ b/zabbix52-java/distinfo
@@ -1,7 +1,7 @@
 $NetBSD$
 
-SHA1 (zabbix-5.2.2.tar.gz) = fb59a2ea190e60d1c9ff43101ca9d489e35a3bb5
-RMD160 (zabbix-5.2.2.tar.gz) = 7a21760571f949aa0fca420927e28735a44b75f3
-SHA512 (zabbix-5.2.2.tar.gz) = 7bb79111ff809a90a5911d7f94f86eddec3a3fa4f91fdfbf013178442de81d22dc13359679570b8d62fe41b664c764c42cbe98936fd195521951aab507933d9b
-Size (zabbix-5.2.2.tar.gz) = 19745101 bytes
+SHA1 (zabbix-5.2.3.tar.gz) = 15461b366452aa8743344f4d8534a89d08ce39b8
+RMD160 (zabbix-5.2.3.tar.gz) = 1b62ee4b634ef565770123d0607782764f447d16
+SHA512 (zabbix-5.2.3.tar.gz) = 207d522ab728bb89f6aaf793af94848469210fb257ead34b93e0f7ba7b2a22b4cce65d516dfbb549a36ae873fe6b6d3486c47f11efff8950d3c81570c673ff9e
+Size (zabbix-5.2.3.tar.gz) = 19791383 bytes
 SHA1 (patch-configure) = cf647b9ee52a96882d31f8783ac19b66e3e65105
diff --git a/zabbix52-proxy/distinfo b/zabbix52-proxy/distinfo
index 630c9d919d..5ba7eb26f6 100644
--- a/zabbix52-proxy/distinfo
+++ b/zabbix52-proxy/distinfo
@@ -1,9 +1,9 @@
 $NetBSD$
 
-SHA1 (zabbix-5.2.2.tar.gz) = fb59a2ea190e60d1c9ff43101ca9d489e35a3bb5
-RMD160 (zabbix-5.2.2.tar.gz) = 7a21760571f949aa0fca420927e28735a44b75f3
-SHA512 (zabbix-5.2.2.tar.gz) = 7bb79111ff809a90a5911d7f94f86eddec3a3fa4f91fdfbf013178442de81d22dc13359679570b8d62fe41b664c764c42cbe98936fd195521951aab507933d9b
-Size (zabbix-5.2.2.tar.gz) = 19745101 bytes
+SHA1 (zabbix-5.2.3.tar.gz) = 15461b366452aa8743344f4d8534a89d08ce39b8
+RMD160 (zabbix-5.2.3.tar.gz) = 1b62ee4b634ef565770123d0607782764f447d16
+SHA512 (zabbix-5.2.3.tar.gz) = 207d522ab728bb89f6aaf793af94848469210fb257ead34b93e0f7ba7b2a22b4cce65d516dfbb549a36ae873fe6b6d3486c47f11efff8950d3c81570c673ff9e
+Size (zabbix-5.2.3.tar.gz) = 19791383 bytes
 SHA1 (patch-m4_ax__lib__mysql.m4) = 9786c6bff3d22334263921c201bf241a207a46bc
 SHA1 (patch-m4_libssh.m4) = 8b4ac3964caf94bb0e4939d265dcefc08a07a0df
 SHA1 (patch-src_libs_zbxsysinfo_netbsd_net.c) = 468f2112a3d65b0a73f371194ae15ce0df0ad71c
diff --git a/zabbix52-server/Makefile b/zabbix52-server/Makefile
index 83cb43d824..4a74e0583d 100644
--- a/zabbix52-server/Makefile
+++ b/zabbix52-server/Makefile
@@ -57,8 +57,8 @@ PLIST_SUBST+=			PKGBASE=${PKGBASE}
 
 CFLAGS.SunOS+=			-DDUK_USE_BYTEORDER=1
 
-REPLACE_BASH+=                  misc/snmptrap/snmptrap.sh \
-                                misc/images/png_to_xml.sh
+REPLACE_BASH+=			misc/snmptrap/snmptrap.sh \
+				misc/images/png_to_xml.sh
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/zabbix52-server/Makefile.common b/zabbix52-server/Makefile.common
index de8dd79cda..96552025a1 100644
--- a/zabbix52-server/Makefile.common
+++ b/zabbix52-server/Makefile.common
@@ -1,11 +1,11 @@
 # $NetBSD$
-# used by sysutils/zabbix52-agent/Makefile
-# used by sysutils/zabbix52-proxy/Makefile
-# used by sysutils/zabbix52-server/Makefile
-# used by sysutils/zabbix52-frontend/Makefile
-# used by sysutils/zabbix52-java/Makefile
+# used by wip/zabbix52-agent/Makefile
+# used by wip/zabbix52-proxy/Makefile
+# used by wip/zabbix52-server/Makefile
+# used by wip/zabbix52-frontend/Makefile
+# used by wip/zabbix52-java/Makefile
 
-DISTNAME=	zabbix-5.2.2
+DISTNAME=	zabbix-5.2.3
 CATEGORIES=	sysutils
 MASTER_SITES=	https://cdn.zabbix.com/zabbix/sources/stable/5.2/
 
diff --git a/zabbix52-server/distinfo b/zabbix52-server/distinfo
index 8c64096742..3ac5773b9a 100644
--- a/zabbix52-server/distinfo
+++ b/zabbix52-server/distinfo
@@ -1,9 +1,9 @@
 $NetBSD$
 
-SHA1 (zabbix-5.2.2.tar.gz) = fb59a2ea190e60d1c9ff43101ca9d489e35a3bb5
-RMD160 (zabbix-5.2.2.tar.gz) = 7a21760571f949aa0fca420927e28735a44b75f3
-SHA512 (zabbix-5.2.2.tar.gz) = 7bb79111ff809a90a5911d7f94f86eddec3a3fa4f91fdfbf013178442de81d22dc13359679570b8d62fe41b664c764c42cbe98936fd195521951aab507933d9b
-Size (zabbix-5.2.2.tar.gz) = 19745101 bytes
+SHA1 (zabbix-5.2.3.tar.gz) = 15461b366452aa8743344f4d8534a89d08ce39b8
+RMD160 (zabbix-5.2.3.tar.gz) = 1b62ee4b634ef565770123d0607782764f447d16
+SHA512 (zabbix-5.2.3.tar.gz) = 207d522ab728bb89f6aaf793af94848469210fb257ead34b93e0f7ba7b2a22b4cce65d516dfbb549a36ae873fe6b6d3486c47f11efff8950d3c81570c673ff9e
+Size (zabbix-5.2.3.tar.gz) = 19791383 bytes
 SHA1 (patch-m4_ax__lib__mysql.m4) = 9786c6bff3d22334263921c201bf241a207a46bc
 SHA1 (patch-m4_libssh.m4) = 8b4ac3964caf94bb0e4939d265dcefc08a07a0df
 SHA1 (patch-src_libs_zbxsysinfo_netbsd_net.c) = 468f2112a3d65b0a73f371194ae15ce0df0ad71c