diff --git a/www/h2o/Makefile b/www/h2o/Makefile
index ce57e5a871da..27885b55a134 100644
--- a/www/h2o/Makefile
+++ b/www/h2o/Makefile
@@ -1,88 +1,81 @@
 # Created by: Dave Cottlehuber <dch@FreeBSD.org>
 
 PORTNAME=	h2o
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.2.6
 CATEGORIES=	www
 
 MAINTAINER=	dch@FreeBSD.org
 COMMENT=	Optimized HTTP/2 server including support for TLS 1.3 and HTTP/1.x
 
 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: unrecognized option '-Wl,-rpath=/usr/local/lib/gcc6'
 
 LIB_DEPENDS=	libuv.so:devel/libuv
 
 USES=		cmake:noninja compiler:c11 cpe perl5 shebangfix ssl pkgconfig
 USE_GITHUB=	yes
 USE_PERL5=	run
 USE_LDCONFIG=	yes
 
 CPE_VENDOR=	dena
 
 CONFLICTS=	h2o-devel
 
 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=ON -DWITH_BUNDLED_SSL=OFF
 
 MRUBY_CMAKE_BOOL=	WITH_MRUBY
 MRUBY_USES=		bison
 MRUBY_USE=		ruby=yes
 MRUBY_VARS=		RUBY_NO_RUN_DEPENDS=yes
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MMRUBY}
-BROKEN_RUBY30=	yes
-BROKEN_RUBY31=	yes
-.endif
-
 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/files/patch-deps_mruby_Rakefile b/www/h2o/files/patch-deps_mruby_Rakefile
new file mode 100644
index 000000000000..edbd51a02ecd
--- /dev/null
+++ b/www/h2o/files/patch-deps_mruby_Rakefile
@@ -0,0 +1,63 @@
+--- deps/mruby/Rakefile.orig	2019-08-12 14:09:44 UTC
++++ deps/mruby/Rakefile
+@@ -37,15 +37,15 @@ bin_path = ENV['INSTALL_DIR'] || "#{MRUBY_ROOT}/bin"
+ task :default => :all
+ 
+ bin_path = ENV['INSTALL_DIR'] || "#{MRUBY_ROOT}/bin"
+-FileUtils.mkdir_p bin_path, { :verbose => $verbose }
++FileUtils.mkdir_p bin_path, verbose: $verbose
+ 
+ depfiles = MRuby.targets['host'].bins.map do |bin|
+   install_path = MRuby.targets['host'].exefile("#{bin_path}/#{bin}")
+   source_path = MRuby.targets['host'].exefile("#{MRuby.targets['host'].build_dir}/bin/#{bin}")
+ 
+   file install_path => source_path do |t|
+-    FileUtils.rm_f t.name, { :verbose => $verbose }
+-    FileUtils.cp t.prerequisites.first, t.name, { :verbose => $verbose }
++    FileUtils.rm_f t.name, verbose: $verbose
++    FileUtils.cp t.prerequisites.first, t.name, verbose: $verbose
+   end
+ 
+   install_path
+@@ -78,8 +78,8 @@ MRuby.each_target do |target|
+         install_path = MRuby.targets['host'].exefile("#{bin_path}/#{bin}")
+ 
+         file install_path => exec do |t|
+-          FileUtils.rm_f t.name, { :verbose => $verbose }
+-          FileUtils.cp t.prerequisites.first, t.name, { :verbose => $verbose }
++          FileUtils.rm_f t.name, verbose: $verbose
++          FileUtils.cp t.prerequisites.first, t.name, verbose: $verbose
+         end
+         depfiles += [ install_path ]
+       elsif target == MRuby.targets['host-debug']
+@@ -87,8 +87,8 @@ MRuby.each_target do |target|
+           install_path = MRuby.targets['host-debug'].exefile("#{bin_path}/#{bin}")
+ 
+           file install_path => exec do |t|
+-            FileUtils.rm_f t.name, { :verbose => $verbose }
+-            FileUtils.cp t.prerequisites.first, t.name, { :verbose => $verbose }
++            FileUtils.rm_f t.name, verbose: $verbose
++            FileUtils.cp t.prerequisites.first, t.name, verbose: $verbose
+           end
+           depfiles += [ install_path ]
+         end
+@@ -127,16 +127,16 @@ task :clean do
+ desc "clean all built and in-repo installed artifacts"
+ task :clean do
+   MRuby.each_target do |t|
+-    FileUtils.rm_rf t.build_dir, { :verbose => $verbose }
++    FileUtils.rm_rf t.build_dir, verbose: $verbose
+   end
+-  FileUtils.rm_f depfiles, { :verbose => $verbose }
++  FileUtils.rm_f depfiles, verbose: $verbose
+   puts "Cleaned up target build folder"
+ end
+ 
+ desc "clean everything!"
+ task :deep_clean => ["clean"] do
+   MRuby.each_target do |t|
+-    FileUtils.rm_rf t.gem_clone_dir, { :verbose => $verbose }
++    FileUtils.rm_rf t.gem_clone_dir, verbose: $verbose
+   end
+   puts "Cleaned up mrbgems build folder"
+ end