diff --git a/www/hiawatha/Makefile b/www/hiawatha/Makefile
index 2c83b5f34be3..0c7d9f8e947a 100644
--- a/www/hiawatha/Makefile
+++ b/www/hiawatha/Makefile
@@ -1,72 +1,72 @@
 PORTNAME=	hiawatha
-DISTVERSION=	12.0
+DISTVERSION=	12.1
 CATEGORIES=	www
 MASTER_SITES=	https://hiawatha.leisink.net/files/download/
 
 MAINTAINER=	pkaipila@gmail.com
 COMMENT=	Advanced and secure web server for Unix
 WWW=		https://hiawatha.leisink.net/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libmbedtls.so:security/mbedtls4
 
 USES=		cmake:insource compiler:c11 cpe localbase:ldflags shebangfix
 CPE_VENDOR=	hiawatha-webserver
 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 LEFH LOADCHECK MONITOR RPROXY TOMAHAWK \
 			TOOLKIT XSLT
 OPTIONS_DEFAULT=	CACHE CGIWRAPPER RPROXY TOOLKIT XSLT
 OPTIONS_SUB=		yes
 
 CACHE_DESC=		Caching support
 CGIWRAPPER_DESC=	Install cgi-wrapper(1) (needs setuid bit)
 LEFH_DESC=		Install Let\'s Encrypt For Hiawatha script
 LOADCHECK_DESC=		Load check support (experimental)
 MONITOR_DESC=		Hiawatha Monitor support
 RPROXY_DESC=		Reverse proxy support
 TOMAHAWK_DESC=		Tomahawk command shell support
 TOOLKIT_DESC=		URL toolkit support
 XSLT_DESC=		XSLT support
 
 CACHE_CMAKE_BOOL=	ENABLE_CACHE
 LEFH_USES=		php:cli
 LOADCHECK_CMAKE_BOOL=	ENABLE_LOADCHECK
 MONITOR_CMAKE_BOOL=	ENABLE_MONITOR
 RPROXY_CMAKE_BOOL=	ENABLE_RPROXY
 TOMAHAWK_CMAKE_BOOL=	ENABLE_TOMAHAWK
 TOOLKIT_CMAKE_BOOL=	ENABLE_TOOLKIT
 XSLT_USES=		gnome
 XSLT_USE=		GNOME=libxslt
 XSLT_CMAKE_BOOL=	ENABLE_XSLT
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/bin/ssi-cgi|${PREFIX}/bin/ssi-cgi|g' \
 		-e 's|/usr/bin|${LOCALBASE}/bin|g' \
 		${WRKSRC}/config/cgi-wrapper.conf \
 		${WRKSRC}/config/hiawatha.conf.in
 	@${REINPLACE_CMD} -e 's|/usr/sbin|${PREFIX}/sbin|g' \
 		-e 's|/etc/hiawatha|${ETCDIR}|g' \
 		${WRKSRC}/man/hiawatha.1.in
 	@${REINPLACE_CMD} -e 's|EnableSandbox|#EnableSandbox|g' \
 		${WRKSRC}/config/hiawatha.conf.in
 
 post-install:
 .for f in hiawatha.conf mimetype.conf cgi-wrapper.conf toolkit.conf error.xslt \
 	index.xslt
 	${INSTALL_DATA} ${WRKSRC}/config/${f} \
 		${STAGEDIR}${PREFIX}/etc/hiawatha/${f}.sample
 .endfor
 	@${MKDIR} ${STAGEDIR}${WWWDIR}
 	${INSTALL_DATA} ${WRKSRC}/extra/index.html \
 		${STAGEDIR}${WWWDIR}/index.html.sample
 
 .include <bsd.port.mk>
diff --git a/www/hiawatha/distinfo b/www/hiawatha/distinfo
index 0fd6af0509ad..98908d139caf 100644
--- a/www/hiawatha/distinfo
+++ b/www/hiawatha/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1772372102
-SHA256 (hiawatha-12.0.tar.gz) = 8ea8a6fe6973c398e49af765fc63b7d9c5b3899d7c6bb001b7e12af174781704
-SIZE (hiawatha-12.0.tar.gz) = 2373929
+TIMESTAMP = 1775567220
+SHA256 (hiawatha-12.1.tar.gz) = e93e5964e69d98061d366fa4a0ec7b5d33d3e92e6c02efa8b291a79c646006b1
+SIZE (hiawatha-12.1.tar.gz) = 3123477
diff --git a/www/hiawatha/pkg-plist b/www/hiawatha/pkg-plist
index 66271ea55187..4e7177240eac 100644
--- a/www/hiawatha/pkg-plist
+++ b/www/hiawatha/pkg-plist
@@ -1,29 +1,27 @@
-bin/ssi-cgi
 @sample %%ETCDIR%%/cgi-wrapper.conf.sample
 @sample %%ETCDIR%%/error.xslt.sample
 @sample %%ETCDIR%%/hiawatha.conf.sample
 @sample %%ETCDIR%%/index.xslt.sample
 @sample %%ETCDIR%%/mimetype.conf.sample
 @sample %%ETCDIR%%/toolkit.conf.sample
 %%LEFH%%lib/hiawatha/letsencrypt/acmev2.php
 %%LEFH%%lib/hiawatha/letsencrypt/config.php
 %%LEFH%%lib/hiawatha/letsencrypt/hiawatha_config.php
 %%LEFH%%lib/hiawatha/letsencrypt/http.php
 %%LEFH%%lib/hiawatha/letsencrypt/https.php
 %%LEFH%%lib/hiawatha/letsencrypt/letsencrypt.conf
 %%LEFH%%lib/hiawatha/letsencrypt/letsencrypt.php
 %%LEFH%%lib/hiawatha/letsencrypt/logfile.php
 %%LEFH%%lib/hiawatha/letsencrypt/openssl.conf
 %%LEFH%%lib/hiawatha/letsencrypt/rsa.php
 %%CGIWRAPPER%%share/man/man1/cgi-wrapper.1.gz
 share/man/man1/hiawatha.1.gz
 %%LEFH%%share/man/man1/lefh.1.gz
-share/man/man1/ssi-cgi.1.gz
 share/man/man1/wigwam.1.gz
 %%CGIWRAPPER%%sbin/cgi-wrapper
 sbin/hiawatha
 %%LEFH%%sbin/lefh
 sbin/wigwam
 @sample %%WWWDIR%%/index.html.sample
 @dir /var/db/hiawatha
 @dir /var/log/hiawatha