diff --git a/www/h2o-devel/Makefile b/www/h2o-devel/Makefile
index 9b5433ffc2b8..5cf48e420fd0 100644
--- a/www/h2o-devel/Makefile
+++ b/www/h2o-devel/Makefile
@@ -1,73 +1,75 @@
 PORTNAME=	h2o
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2.3.0-dev.20230817
+DISTVERSION=	2.3.0-dev.20230928
 CATEGORIES=	www
 PKGNAMESUFFIX=	-devel
 
 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
 BROKEN_FreeBSD_12_powerpc64=	fails to link on powerpc64 elfv1: unrecognized option '-Wl,-rpath=/usr/local/lib/gcc6'
 
 BUILD_DEPENDS=	rubygem-rake>=0:devel/rubygem-rake
 LIB_DEPENDS=	libuv.so:devel/libuv
 
 USES=		cmake:noninja compiler:c11 cpe perl5 pkgconfig shebangfix ssl
 CPE_VENDOR=	dena
 USE_GITHUB=	yes
-GH_TAGNAME=	70dd2d8
+GH_TAGNAME=	cb9f500
 USE_LDCONFIG=	yes
 USE_RC_SUBR=	${PORTNAME}
 
 SHEBANG_FILES=	share/h2o/start_server
 
 CMAKE_ARGS+=	-DBUILD_SHARED_LIBS=OFF \
 		-DWITH_BUNDLED_SSL=OFF
+.if ${ARCH} == "i386"
+CMAKE_ARGS+=	-DWITH_FUSION=OFF
+.endif
 
 CONFLICTS=	h2o
 
 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_USES=		bison ruby:build
 MRUBY_CMAKE_BOOL=	WITH_MRUBY
 
 .include <bsd.port.options.mk>
 
 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-devel/distinfo b/www/h2o-devel/distinfo
index 74dbcc4f6cff..26ae0de3492a 100644
--- a/www/h2o-devel/distinfo
+++ b/www/h2o-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1693558446
-SHA256 (h2o-h2o-v2.3.0-dev.20230817-70dd2d8_GH0.tar.gz) = 075f1da946b4fe32792b3f97e9ac44463febbef6235533d59a5c4bc53bc8c09d
-SIZE (h2o-h2o-v2.3.0-dev.20230817-70dd2d8_GH0.tar.gz) = 30555369
+TIMESTAMP = 1695982211
+SHA256 (h2o-h2o-v2.3.0-dev.20230928-cb9f500_GH0.tar.gz) = dd863138f0995a93456057846b5bcd0943c23984d7fe31a5621022cf85748313
+SIZE (h2o-h2o-v2.3.0-dev.20230928-cb9f500_GH0.tar.gz) = 30557709