diff --git a/www/hiawatha/Makefile b/www/hiawatha/Makefile
index b5fd0a9b7200..d3839b186483 100644
--- a/www/hiawatha/Makefile
+++ b/www/hiawatha/Makefile
@@ -1,71 +1,70 @@
 PORTNAME=	hiawatha
-DISTVERSION=	11.7
-PORTREVISION=	1
+DISTVERSION=	11.8
 CATEGORIES=	www
 MASTER_SITES=	https://hiawatha.leisink.net/files/
 
 MAINTAINER=	cpetrik@proton.me
 COMMENT=	Advanced and secure web server for Unix
 WWW=		https://hiawatha.leisink.net/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libmbedtls.so:security/mbedtls3
 
 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
 
 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 71d8a3742a70..fbcd961a8321 100644
--- a/www/hiawatha/distinfo
+++ b/www/hiawatha/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1746664802
-SHA256 (hiawatha-11.7.tar.gz) = 8bc180ae3b986d02466f081efeefdb1595d96783f581fded2a9b198752ab7ae1
-SIZE (hiawatha-11.7.tar.gz) = 1914236
+TIMESTAMP = 1758851777
+SHA256 (hiawatha-11.8.tar.gz) = 1376763750fb9a88a780bac6aba8707bc2a78f8ee089c62d433e50216a5183bd
+SIZE (hiawatha-11.8.tar.gz) = 1922802
diff --git a/www/hiawatha/files/patch-CMakeLists.txt b/www/hiawatha/files/patch-CMakeLists.txt
deleted file mode 100644
index 501c27952b07..000000000000
--- a/www/hiawatha/files/patch-CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
---- CMakeLists.txt.orig	2024-03-29 19:55:54 UTC
-+++ CMakeLists.txt
-@@ -2,7 +2,7 @@ project(Hiawatha VERSION 11.6 LANGUAGES C)
- project(Hiawatha VERSION 11.6 LANGUAGES C)
- 
- # Compiler
--set(CMAKE_C_FLAGS "-O2 -Wall -Wextra ${CMAKE_C_FLAGS} -gdwarf-4")
-+set(CMAKE_C_FLAGS "-O2 -Wall -Wextra -gdwarf-4 ${CMAKE_C_FLAGS}")
- set(CMAKE_BUILD_TYPE "RelWithDebInfo")
- 
- # Options