diff --git a/net-mgmt/zabbix3-agent/Makefile b/net-mgmt/zabbix3-agent/Makefile
index 724f60991f34..b2a3f7c6e13b 100644
--- a/net-mgmt/zabbix3-agent/Makefile
+++ b/net-mgmt/zabbix3-agent/Makefile
@@ -5,10 +5,15 @@ PORTNAME=	zabbix3
 CATEGORIES=	net-mgmt
 PKGNAMESUFFIX=	-agent
 
+MAINTAINER=	pakhom@pakhom.spb.ru
+COMMENT=	Enterprise-class open source distributed monitoring (${PKGNAMESUFFIX:S/^-//}) LTS
+
+LICENSE=	GPLv2
+
 MASTERDIR=	${.CURDIR}/../zabbix3-server
 PLIST=		${PKGDIR}/pkg-plist.agent
 
 OPTIONS_DEFINE=		IPV6
-OPTIONS_DEFAULT=	IPV6
+OPTIONS_DEFAULT=	IPV6 OPENSSL
 
 .include "${MASTERDIR}/Makefile"
diff --git a/net-mgmt/zabbix3-proxy/Makefile b/net-mgmt/zabbix3-proxy/Makefile
index 8abd47dda4cb..09af4b39c14f 100644
--- a/net-mgmt/zabbix3-proxy/Makefile
+++ b/net-mgmt/zabbix3-proxy/Makefile
@@ -5,6 +5,11 @@ PORTNAME=	zabbix3
 CATEGORIES=	net-mgmt
 PKGNAMESUFFIX=	-proxy
 
+MAINTAINER=	pakhom@pakhom.spb.ru
+COMMENT=	Enterprise-class open source distributed monitoring (${PKGNAMESUFFIX:S/^-//}) LTS
+
+LICENSE=	GPLv2
+
 MASTERDIR=	${.CURDIR}/../zabbix3-server
 
 .include "${MASTERDIR}/Makefile"
diff --git a/net-mgmt/zabbix3-server/Makefile b/net-mgmt/zabbix3-server/Makefile
index 638ac39880b5..b1733b2f4d73 100644
--- a/net-mgmt/zabbix3-server/Makefile
+++ b/net-mgmt/zabbix3-server/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	zabbix3
 PORTVERSION=	3.0.1
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	net-mgmt
 MASTER_SITES=	SF/zabbix/ZABBIX%20Latest%20Stable/${PORTVERSION}
 PKGNAMESUFFIX?=	-server
@@ -72,7 +72,8 @@ CONFIGURE_ARGS+=	--with-net-snmp
 
 OPTIONS_DEFINE=		IPV6 FPING JABBER CURL LDAP IPMI SSH NMAP JAVAGW \
 			LIBXML2
-OPTIONS_DEFAULT=	IPV6 FPING JABBER CURL UNIXODBC MYSQL SSH
+
+OPTIONS_DEFAULT=	IPV6 FPING JABBER CURL UNIXODBC MYSQL SSH OPENSSL
 OPTIONS_SUB=		yes
 
 CURL_DESC=		Support for web monitoring
@@ -86,9 +87,10 @@ ODBC_DESC=		Support for database checks via ODBC
 JAVAGW_DESC=		Support for Java gateway
 LIBXML2_DESC=		Support for libxml2 (required by monitoring VMware)
 
-OPTIONS_SINGLE=		DB ODBC
+OPTIONS_SINGLE=		DB ODBC SSL
 OPTIONS_SINGLE_DB=	MYSQL PGSQL SQLITE ORACLE
 OPTIONS_SINGLE_ODBC=	IODBC UNIXODBC
+OPTIONS_SINGLE_SSL=	OPENSSL GNUTLS POLARSSL
 
 MYSQL_CONFIGURE_WITH=	mysql
 MYSQL_USE=		MYSQL=yes
@@ -123,6 +125,9 @@ IODBC_LIB_DEPENDS=	libiodbc.so:databases/libiodbc
 
 UNIXODBC_CONFIGURE_WITH=unixodbc
 UNIXODBC_LIB_DEPENDS=	libodbc.so:databases/unixODBC
+.else
+OPTIONS_SINGLE=         SSL
+OPTIONS_SINGLE_SSL=     OPENSSL GNUTLS POLARSSL
 .endif # if ${ZABBIX_BUILD} != "agent"
 
 IPV6_CONFIGURE_ENABLE=	ipv6
@@ -136,8 +141,23 @@ JAVAGW_USE=		JAVA=yes
 LIBXML2_CONFIGURE_WITH=	libxml2
 LIBXML2_LIB_DEPENDS=	libxml2.so:textproc/libxml2
 
+OPENSSL_CONFIGURE_WITH= openssl
+OPENSSL_USE=            OPENSSL=yes
+
+WITH_OPENSSL_PORT=yes
+
+GNUTLS_CONFIGURE_WITH=	gnutls
+GNUTLS_LIB_DEPENDS=     libgnutls.so:security/gnutls
+
+POLARSSL_CONFIGURE_WITH=mbedtls
+POLARSSL_LIB_DEPENDS=	libmbedtls.so:security/polarssl13
+
 .include <bsd.port.options.mk>
 
+.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000000
+WITH_OPENSSL_PORT=yes
+.endif
+
 post-patch:
 	@${GREP} -rl "/etc/zabbix" ${WRKSRC} \
 	  | ${XARGS} ${REINPLACE_CMD} -e 's#/etc/zabbix#${ETCDIR}#g'