diff --git a/www/h2o-devel/Makefile b/www/h2o-devel/Makefile
index 6439dca4eeb8..15a9a7505acd 100644
--- a/www/h2o-devel/Makefile
+++ b/www/h2o-devel/Makefile
@@ -1,79 +1,80 @@
 PORTNAME=	h2o
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2.3.0-dev.20220519
+DISTVERSION=	2.3.0-dev.20230427
 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=	MIT BSD2CLAUSE
 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 shebangfix ssl pkgconfig
 CPE_VENDOR=	dena
 USE_GITHUB=	yes
 USE_LDCONFIG=	yes
-GH_TAGNAME=	cf59e67
+GH_TAGNAME=	f010336
 CONFLICTS=	h2o
 
 SHEBANG_FILES=	share/h2o/start_server
 
 PORTDOCS=	README.md
 
 SUB_FILES=	${PORTNAME} ${PORTNAME}.conf.sample
 SUB_LIST+=	H2O_USER=${H2O_USER} \
 		H2O_GROUP=${H2O_GROUP} \
 		H2O_LOGDIR=${H2O_LOGDIR}
 
 PLIST_SUB=	H2O_USER=${H2O_USER} \
 		H2O_GROUP=${H2O_GROUP} \
 		H2O_LOGDIR=${H2O_LOGDIR}
 
 H2O_USER?=	www
 H2O_GROUP?=	www
 
 H2O_LOGDIR=	/var/log/${PORTNAME}/
 
 USE_RC_SUBR=	${PORTNAME}
 
 OPTIONS_DEFINE=		MRUBY DOCS
 OPTIONS_DEFAULT=	MRUBY
 OPTIONS_SUB=		yes
 MRUBY_DESC=		Build with embedded mruby handler support
 
 CMAKE_ARGS+=		-DBUILD_SHARED_LIBS=OFF -DWITH_BUNDLED_SSL=OFF
 
 MRUBY_CMAKE_BOOL=	WITH_MRUBY
 MRUBY_USES=		bison ruby:build
 
 .include <bsd.port.options.mk>
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|exec perl|exec ${LOCALBASE}/bin/perl|' \
 		${WRKSRC}/share/h2o/annotate-backtrace-symbols \
 		${WRKSRC}/share/h2o/fastcgi-cgi \
 		${WRKSRC}/share/h2o/fetch-ocsp-response \
 		${WRKSRC}/share/h2o/kill-on-close \
 		${WRKSRC}/share/h2o/setuidgid \
 		${WRKSRC}/share/h2o/start_server
 
 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 997e44227414..d915bed709d4 100644
--- a/www/h2o-devel/distinfo
+++ b/www/h2o-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1653328775
-SHA256 (h2o-h2o-v2.3.0-dev.20220519-cf59e67_GH0.tar.gz) = 04c63ecb997441bfee036dbb1ab75562f4b6ef38b2aab3ada2cba7d029208eec
-SIZE (h2o-h2o-v2.3.0-dev.20220519-cf59e67_GH0.tar.gz) = 30128232
+TIMESTAMP = 1682863965
+SHA256 (h2o-h2o-v2.3.0-dev.20230427-f010336_GH0.tar.gz) = d8668a6687340e8af56ce997fd36687ff4c41d86d8d195eb6dff8b46e746b3ff
+SIZE (h2o-h2o-v2.3.0-dev.20230427-f010336_GH0.tar.gz) = 30505376
diff --git a/www/h2o-devel/files/patch-deps_mruby_Rakefile b/www/h2o-devel/files/patch-deps_mruby_Rakefile
deleted file mode 100644
index 385ba00b3289..000000000000
--- a/www/h2o-devel/files/patch-deps_mruby_Rakefile
+++ /dev/null
@@ -1,16 +0,0 @@
---- deps/mruby/Rakefile.orig	2022-04-27 17:08:45 UTC
-+++ deps/mruby/Rakefile
-@@ -33,10 +33,9 @@ def install_D(src, dst)
- load "#{MRUBY_ROOT}/tasks/gitlab.rake"
- 
- def install_D(src, dst)
--  opts = { :verbose => $verbose }
--  FileUtils.rm_f dst, opts
--  FileUtils.mkdir_p File.dirname(dst), opts
--  FileUtils.cp src, dst, opts
-+  FileUtils.rm_f dst, verbose: $verbose
-+  FileUtils.mkdir_p File.dirname(dst), verbose: $verbose
-+  FileUtils.cp src, dst, verbose: $verbose
- end
- 
- ##############################