Index: net-mgmt/zabbix22-server/Makefile
===================================================================
--- net-mgmt/zabbix22-server/Makefile	(revision 451347)
+++ net-mgmt/zabbix22-server/Makefile	(working copy)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	zabbix22
-PORTVERSION=	2.2.19
+PORTVERSION=	2.2.20
 PORTREVISION?=	0
 CATEGORIES=	net-mgmt
 MASTER_SITES=	SF/zabbix/ZABBIX%20Latest%20Stable/${PORTVERSION}
@@ -12,11 +12,12 @@
 MAINTAINER=	pg@pakhom.spb.ru
 COMMENT=	Enterprise-class open source distributed monitoring (${PKGNAMESUFFIX:S/^-//}) LTS
 
-LICENSE=	GPLv2
+LICENSE=	GPLv2+
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libnetsnmp.so:net-mgmt/net-snmp
 
-CONFLICTS=	zabbix[0-13-9][0-13-9]${PKGNAMESUFFIX} zabbix[0-9]${PKGNAMESUFFIX}
+CONFLICTS=	zabbix[0-13-9][0-9]${PKGNAMESUFFIX} zabbix[0-9]${PKGNAMESUFFIX}
 
 ZABBIX_BUILD=	${PKGNAMESUFFIX:S/^-//}
 
Index: net-mgmt/zabbix22-server/distinfo
===================================================================
--- net-mgmt/zabbix22-server/distinfo	(revision 451347)
+++ net-mgmt/zabbix22-server/distinfo	(working copy)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1502890028
-SHA256 (zabbix-2.2.19.tar.gz) = 311d70a1d0868eeda752b3e9555afbbdf3f37b380e79b0b0ee138e4be488873c
-SIZE (zabbix-2.2.19.tar.gz) = 15497840
+TIMESTAMP = 1506433032
+SHA256 (zabbix-2.2.20.tar.gz) = 139a4000455bf948df247b4312b9127701596e80742e605beabcf93da4bfee02
+SIZE (zabbix-2.2.20.tar.gz) = 15503661
Index: net-mgmt/zabbix22-server/pkg-plist.frontend
===================================================================
--- net-mgmt/zabbix22-server/pkg-plist.frontend	(revision 451347)
+++ net-mgmt/zabbix22-server/pkg-plist.frontend	(working copy)
@@ -287,6 +287,7 @@
 %%WWWDIR%%/include/classes/helpers/CArrayHelper.php
 %%WWWDIR%%/include/classes/validators/CValidator.php
 %%WWWDIR%%/include/classes/validators/CDecimalValidator.php
+%%WWWDIR%%/include/classes/validators/CHtmlUrlValidator.php
 %%WWWDIR%%/include/classes/validators/CTimePeriodValidator.php
 %%WWWDIR%%/include/classes/validators/CTriggerFunctionValidator.php
 %%WWWDIR%%/include/classes/validators/CCollectionValidator.php