diff --git a/www/hiawatha/Makefile b/www/hiawatha/Makefile
index 3bab5b7b5563..8cae8ab86797 100644
--- a/www/hiawatha/Makefile
+++ b/www/hiawatha/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	hiawatha
-PORTVERSION=	10.9
-PORTREVISION=	2
+PORTVERSION=	10.10
 CATEGORIES=	www
 MASTER_SITES=	https://www.hiawatha-webserver.org/files/
 
@@ -13,17 +12,20 @@ COMMENT=	Advanced and secure webserver for Unix
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USES=		cmake:insource compiler:c11 shebangfix
+LIB_DEPENDS=	libmbedtls.so:security/mbedtls
+
+USES=		cmake:insource compiler:c11 localbase:ldflags shebangfix
 USE_RC_SUBR=	hiawatha
 SHEBANG_FILES=	extra/letsencrypt/lefh.in
 
 CMAKE_ARGS=	-DCMAKE_INSTALL_LOCALSTATEDIR=/var \
 		-DWEBROOT_DIR=${WWWDIR} \
 		-DWORK_DIR=/var/db/${PORTNAME}
+CMAKE_ON=	USE_SYSTEM_MBEDTLS
 
-OPTIONS_DEFINE=		CACHE CGIWRAPPER IPV6 LEFH LOADCHECK MBEDTLS MONITOR \
-			RPROXY TOMAHAWK TOOLKIT XSLT
-OPTIONS_DEFAULT=	CACHE CGIWRAPPER MBEDTLS RPROXY TOOLKIT XSLT
+OPTIONS_DEFINE=		CACHE CGIWRAPPER LEFH LOADCHECK MONITOR RPROXY TOMAHAWK \
+			TOOLKIT XSLT
+OPTIONS_DEFAULT=	CACHE CGIWRAPPER RPROXY TOOLKIT XSLT
 OPTIONS_SUB=		yes
 
 CACHE_DESC=		Caching support
@@ -37,13 +39,8 @@ TOOLKIT_DESC=		URL toolkit support
 XSLT_DESC=		XSLT support
 
 CACHE_CMAKE_BOOL=	ENABLE_CACHE
-IPV6_CMAKE_BOOL=	ENABLE_IPV6
-LEFH_IMPLIES=		MBEDTLS
 LEFH_USES=		php:cli
 LOADCHECK_CMAKE_BOOL=	ENABLE_LOADCHECK
-MBEDTLS_LIB_DEPENDS=	libmbedtls.so:security/mbedtls
-MBEDTLS_USES=		localbase:ldflags
-MBEDTLS_CMAKE_BOOL=	ENABLE_TLS USE_SYSTEM_MBEDTLS
 MONITOR_CMAKE_BOOL=	ENABLE_MONITOR
 RPROXY_CMAKE_BOOL=	ENABLE_RPROXY
 TOMAHAWK_CMAKE_BOOL=	ENABLE_TOMAHAWK
diff --git a/www/hiawatha/distinfo b/www/hiawatha/distinfo
index 5262a5f1b54c..1088d1231f5d 100644
--- a/www/hiawatha/distinfo
+++ b/www/hiawatha/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1550525987
-SHA256 (hiawatha-10.9.tar.gz) = 74dd43812272c3ddbf067b6d4da1773cdeef2ffe71e8f164449fabf8431752b8
-SIZE (hiawatha-10.9.tar.gz) = 1139702
+TIMESTAMP = 1568958968
+SHA256 (hiawatha-10.10.tar.gz) = b5e46f5757fa647e77d21d24f7eea912d59f26a75558cba780b45c1c3a33a4d9
+SIZE (hiawatha-10.10.tar.gz) = 1168325
diff --git a/www/hiawatha/pkg-help b/www/hiawatha/pkg-help
index c6db296376f9..6d6e28513f11 100644
--- a/www/hiawatha/pkg-help
+++ b/www/hiawatha/pkg-help
@@ -13,8 +13,8 @@ properly, the CGI wrapper binary needs to have the setuid bit set.
 
 LEFH
 Install the 'lefh' (Let's Encrypt For Hiawatha) tool to help in
-obtaining and maintaining Let's Encrypt certificates.  It needs PHP
-and also implies having MBEDTLS enabled.
+obtaining and maintaining Let's Encrypt certificates.  It requires
+PHP.
 
 LOADCHECK
 Enable experimental support for MaxServerLoad.  When the host has
@@ -22,11 +22,6 @@ a load higher than that value, Hiawatha will drop incoming connections.
 Officially this feature is only available on Linux.  FreeBSD support
 is largely untested.
 
-MBEDTLS
-Enable TLS support via security/mbedtls.  It is required for the
-MinTLSversion, PublicKeyPins, RequiredCA, RequireTLS, and TLScertFile
-settings.
-
 MONITOR
 Enable Hiawatha Monitor support.  The MonitorServer setting enables
 logging of statistical information to a remote monitor server running