diff --git a/www/h2o/Makefile b/www/h2o/Makefile
index e2da3cffdfe5..5af1989bb29f 100644
--- a/www/h2o/Makefile
+++ b/www/h2o/Makefile
@@ -1,76 +1,76 @@
 PORTNAME=	h2o
-DISTVERSION=	20260501
+DISTVERSION=	20260609
 CATEGORIES=	www
 
 MAINTAINER=	dch@FreeBSD.org
 COMMENT=	Optimized HTTP/2 server including support for TLS 1.3 and HTTP/1.x
 WWW=		https://github.com/h2o/h2o
 
 LICENSE=	BSD2CLAUSE MIT
 LICENSE_COMB=	multi
 
 BROKEN_armv6=	fails to compile: asm_arm.inc:139:36: '.syntax divided' arm assembly not supported
 BROKEN_armv7=	fails to compile: asm_arm.inc:139:36: '.syntax divided' arm assembly not supported
 
 LIB_DEPENDS=	libhiredis.so:databases/hiredis \
 		libyaml.so:textproc/libyaml
 
 USES=		cmake compiler:c11 cpe pathfix perl5 pkgconfig shebangfix ssl
 CPE_VENDOR=	dena
 USE_GITHUB=	yes
-GH_TAGNAME=	8cb324b
+GH_TAGNAME=	ed7899d
 USE_LDCONFIG=	YES
 USE_RC_SUBR=	${PORTNAME}
 
 SHEBANG_FILES=	share/h2o/start_server
 
 CMAKE_ON=	BUILD_SHARED_LIBS
 
 EXTRACT_AFTER_ARGS=	--exclude deps/hiredis --exclude deps/yaml/include
 
 SUB_FILES=	${PORTNAME} ${PORTNAME}.conf.sample
 SUB_LIST=	H2O_GROUP=${H2O_GROUP} \
 		H2O_LOGDIR=${H2O_LOGDIR} \
 		H2O_USER=${H2O_USER}
 
 PLIST_SUB=	H2O_GROUP=${H2O_GROUP} \
 		H2O_LOGDIR=${H2O_LOGDIR} \
 		H2O_USER=${H2O_USER}
 PORTDOCS=	README.md
 
 .ifnmake portclippy
 H2O_USER?=	www
 H2O_GROUP?=	www
 
 H2O_LOGDIR=	/var/log/${PORTNAME}/
 .endif
 
 OPTIONS_DEFINE=		DOCS MRUBY
 OPTIONS_DEFAULT=	MRUBY
 OPTIONS_SUB=		yes
 MRUBY_DESC=		Build with embedded mruby handler support
 MRUBY_BUILD_DEPENDS+=	rubygem-rake>=0:devel/rubygem-rake
 MRUBY_USES=		bison libtool ruby:build
 MRUBY_CMAKE_BOOL=	WITH_MRUBY
 
 .include <bsd.port.options.mk>
 
 .if ${ARCH} == amd64 && defined(CPUTYPE) && ${MACHINE_CPU:Mavx2}
 EXTRA_PATCHES=	${PATCHDIR}/extra-patch-cputype-defined
 CMAKE_ON+=	WITH_FUSION
 .else
 CMAKE_OFF+=	WITH_FUSION
 .endif
 
 post-install:
 	${MKDIR} ${STAGEDIR}${ETCDIR} \
 		${STAGEDIR}${H2O_LOGDIR}
 	${INSTALL_DATA} ${WRKDIR}/${PORTNAME}.conf.sample \
 		${STAGEDIR}${ETCDIR}/${PORTNAME}.conf.sample
 
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.md \
 		${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/www/h2o/distinfo b/www/h2o/distinfo
index 14439c08edb4..fba6d6dd6c29 100644
--- a/www/h2o/distinfo
+++ b/www/h2o/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1777878785
-SHA256 (h2o-h2o-20260501-8cb324b_GH0.tar.gz) = 8e5fed23ef2132cf8ddd1ded9f1e2163422079385dfeafc17c2ba628f8a314e1
-SIZE (h2o-h2o-20260501-8cb324b_GH0.tar.gz) = 30872535
+TIMESTAMP = 1781217938
+SHA256 (h2o-h2o-20260609-ed7899d_GH0.tar.gz) = 18fb3e194b596131721bbd866f708c318440919d3c01fa73dcb955503f5aa741
+SIZE (h2o-h2o-20260609-ed7899d_GH0.tar.gz) = 30889720