diff --git a/www/neon/Makefile b/www/neon/Makefile
index aa261fd0c879..48fcbfa263f6 100644
--- a/www/neon/Makefile
+++ b/www/neon/Makefile
@@ -2,58 +2,61 @@
 # $FreeBSD$
 
 PORTNAME=	neon
-PORTVERSION=	0.30.2
-PORTREVISION=	4
+DISTVERSION=	0.31.2
 CATEGORIES=	www
-MASTER_SITES=	LOCAL/lev
+MASTER_SITES=	https://notroj.github.io/${PORTNAME}/
 
 MAINTAINER=	lev@FreeBSD.org
 COMMENT=	HTTP and WebDAV client library for Unix systems
 
 LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/src/COPYING.LIB
 
-USES=		pathfix libtool
+USES=		pathfix libtool localbase:ldflags pkgconfig
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 
-OPTIONS_SUB=		yes
-OPTIONS_DEFINE=		CA_BUNDLE DOCS GSSAPI NLS OPENSSL PROXY
+CONFIGURE_ARGS=	--enable-shared
+
+OPTIONS_DEFINE=		CA_BUNDLE DOCS GSSAPI NLS PROXY
 OPTIONS_DEFAULT=	CA_BUNDLE EXPAT GSSAPI OPENSSL
+
+OPTIONS_RADIO=		SSL
+OPTIONS_RADIO_SSL=	GNUTLS OPENSSL
 OPTIONS_SINGLE=		XML
-OPTIONS_SINGLE_XML=	EXPAT LIBXML
+OPTIONS_SINGLE_XML=	EXPAT LIBXML2
 
-CA_BUNDLE_DESC=		Install CA bundle for OpenSSL
-LIBXML_DESC=		libxml2 XML parser support
+OPTIONS_SUB=		yes
+
+CA_BUNDLE_DESC=		Enable CA bundle for GnuTLS/OpenSSL
 PROXY_DESC=		libproxy support
 XML_DESC=		XML parser library
 
 CA_BUNDLE_CONFIGURE_ON=	--with-ca-bundle=${LOCALBASE}/share/certs/ca-root-nss.crt
 CA_BUNDLE_RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
-EXPAT_CONFIGURE_WITH=	expat
+
 EXPAT_LIB_DEPENDS=	libexpat.so:textproc/expat2
+EXPAT_CONFIGURE_WITH=	expat
+
+GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
+GNUTLS_CONFIGURE_ON=	--with-ssl=gnutls --enable-threadsafe-ssl=posix
+
 GSSAPI_CONFIGURE_WITH=	gssapi
-LIBXML_CONFIGURE_WITH=	libxml2
-LIBXML_USES=		gnome
-LIBXML_USE=		GNOME=libxml2
-NLS_CONFIGURE_ENABLE=	nls
+
+LIBXML2_USES=		gnome
+LIBXML2_USE=		GNOME=libxml2
+LIBXML2_CONFIGURE_WITH=	libxml2
+
 NLS_USES=		gettext
-OPENSSL_CONFIGURE_ENV=	ne_cv_libsfor_SSL_library_init=-lssl
-OPENSSL_CONFIGURE_WITH=	ssl
+NLS_CONFIGURE_ENABLE=	nls
+
 OPENSSL_USES=		ssl
+OPENSSL_CONFIGURE_ENV=	ne_cv_libsfor_SSL_library_init=-lssl
+OPENSSL_CONFIGURE_ON=	--with-ssl=openssl --enable-threadsafe-ssl=posix
+
 PROXY_CONFIGURE_WITH=	libproxy
 PROXY_LIB_DEPENDS=	libproxy.so:net/libproxy
 
-.include <bsd.port.options.mk>
-
-CONFIGURE_ARGS+=--enable-shared \
-		--with-libs=${LOCALBASE}:${PREFIX}
-
-.if ${PORT_OPTIONS:MCA_BUNDLE} && !${PORT_OPTIONS:MOPENSSL}
-WARNING+=	"OpenSSL need for CA bundle support"
-WARNING+=	"Enable the OPENSSL option or disable the CA_BUNDLE option"
-.endif
-
-PLIST_SUB+=	PORTVERSION=${PORTVERSION}
 DOCSDIR=	${PREFIX}/share/doc/neon
 
 post-patch:
diff --git a/www/neon/distinfo b/www/neon/distinfo
index 94b1f150a39d..c7629c3265c1 100644
--- a/www/neon/distinfo
+++ b/www/neon/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1529335398
-SHA256 (neon-0.30.2.tar.gz) = db0bd8cdec329b48f53a6f00199c92d5ba40b0f015b153718d1b15d3d967fbca
-SIZE (neon-0.30.2.tar.gz) = 932779
+TIMESTAMP = 1603055082
+SHA256 (neon-0.31.2.tar.gz) = cf1ee3ac27a215814a9c80803fcee4f0ede8466ebead40267a9bd115e16a8678
+SIZE (neon-0.31.2.tar.gz) = 867914
diff --git a/www/neon/pkg-descr b/www/neon/pkg-descr
index 692e66bfdb19..4118d28c0c74 100644
--- a/www/neon/pkg-descr
+++ b/www/neon/pkg-descr
@@ -16,4 +16,4 @@ interface. Featuring:
 	. WebDAV metadata support: set and remove properties, query
 	  any set of properties (PROPPATCH/PROPFIND).
 
-WWW: http://www.webdav.org/neon/
+WWW: https://notroj.github.io/neon/
diff --git a/www/neon/pkg-plist b/www/neon/pkg-plist
index 04bea6900268..a7e1d3c53928 100644
--- a/www/neon/pkg-plist
+++ b/www/neon/pkg-plist
@@ -26,7 +26,7 @@ include/neon/ne_xmlreq.h
 lib/libneon.a
 lib/libneon.so
 lib/libneon.so.27
-lib/libneon.so.27.3.2
+lib/libneon.so.27.4.2
 libdata/pkgconfig/neon.pc
 man/man1/neon-config.1.gz
 man/man3/ne_add_request_header.3.gz