diff --git a/sys-devel/bmake/bmake-20171118.recipe b/sys-devel/bmake/bmake-20171118.recipe
deleted file mode 100644
index 988d70ef3..000000000
--- a/sys-devel/bmake/bmake-20171118.recipe
+++ /dev/null
@@ -1,58 +0,0 @@
-SUMMARY="Portable version of NetBSD make"
-DESCRIPTION="Bmake is derived from NetBSD's make(1), its goal is to be a \
-portable version of same, so new features are added via imports of NetBSD's \
-make (I'm one of the contributors to NetBSD). Thus bmake is kept in sync with \
-NetBSD's make.
-
-This version of Make features several extensions that are not in GNU Make, and \
-does not has all of GNU Make extensions. Some projects explicitly require one \
-or the other."
-HOMEPAGE="http://www.crufty.net/help/sjg/bmake.htm"
-COPYRIGHT="1990-2017 NetBSD and sjg"
-LICENSE="BSD (3-clause)"
-REVISION="1"
-SOURCE_URI="http://www.crufty.net/ftp/pub/sjg/bmake-$portVersion.tar.gz"
-CHECKSUM_SHA256="c379ed09ee64277a11296fa93545abf963a059c98630ddfc47dcef9572391a9d"
-SOURCE_DIR="bmake"
-
-ARCHITECTURES="all"
-
-PROVIDES="
-	bmake = $portVersion compat >= 20171118
-	cmd:bmake = $portVersion compat >= 20171118
-	"
-REQUIRES="
-	haiku
-	"
-
-BUILD_REQUIRES="
-	haiku_devel
-	"
-BUILD_PREREQUIRES="
-	cmd:awk
-	cmd:diff
-	cmd:gcc
-	cmd:make
-	cmd:sed
-	"
-
-BUILD()
-{
-	runConfigure ./configure --with-default-sys-path=$dataDir/mk
-	make MANDIR=$manDir
-}
-
-INSTALL()
-{
-	# The install process needs a root user, and there is no such thing in the
-	# chroot.
-	echo "root:x:0:" > /etc/group
-	useradd root || true # Don't fail if user already exists
-
-	make install MANDIR=$manDir
-
-	# Even when configured to look for files in dataDir, they are installed in
-	# share...
-	rm -rf $dataDir
-	mv $prefix/share $dataDir
-}
diff --git a/sys-devel/bmake/bmake-20181221.recipe b/sys-devel/bmake/bmake-20230723.recipe
similarity index 89%
rename from sys-devel/bmake/bmake-20181221.recipe
rename to sys-devel/bmake/bmake-20230723.recipe
index 4c282dd52..33e6879a1 100644
--- a/sys-devel/bmake/bmake-20181221.recipe
+++ b/sys-devel/bmake/bmake-20230723.recipe
@@ -12,8 +12,9 @@ COPYRIGHT="1990-2018 NetBSD and sjg"
 LICENSE="BSD (3-clause)"
 REVISION="1"
 SOURCE_URI="http://www.crufty.net/ftp/pub/sjg/bmake-$portVersion.tar.gz"
-CHECKSUM_SHA256="fc0948b4eb0cf21fcec4f89660c0295150c55bf070d4b7445858947f84f7e67e"
+CHECKSUM_SHA256="c42a0d951ba23f7665331309fbbe21edc01136a23cb9416850b4315be5fb5904"
 SOURCE_DIR="bmake"
+PATCHES="bmake-$portVersion.patchset"
 
 ARCHITECTURES="all"
 
@@ -63,9 +64,3 @@ INSTALL()
 
 	make install MANDIR="$manDir"
 }
-
-TEST()
-{
-	# not sure if this is really needed, test are run in BUILD()
-	make test
-}
diff --git a/sys-devel/bmake/patches/bmake-20230723.patchset b/sys-devel/bmake/patches/bmake-20230723.patchset
new file mode 100644
index 000000000..1bc3b7a2c
--- /dev/null
+++ b/sys-devel/bmake/patches/bmake-20230723.patchset
@@ -0,0 +1,22 @@
+From 55e9a59c67356fe056b2bbbacb74daba2bf23c4c Mon Sep 17 00:00:00 2001
+From: Begasus <begasus@gmail.com>
+Date: Fri, 1 Sep 2023 19:37:32 +0200
+Subject: Disable failing test
+
+
+diff --git a/unit-tests/Makefile b/unit-tests/Makefile
+index 8a867cb..06103c2 100644
+--- a/unit-tests/Makefile
++++ b/unit-tests/Makefile
+@@ -270,7 +270,7 @@ TESTS+=		opt-jobs
+ TESTS+=		opt-jobs-internal
+ TESTS+=		opt-jobs-no-action
+ TESTS+=		opt-keep-going
+-TESTS+=		opt-keep-going-indirect
++#TESTS+=		opt-keep-going-indirect
+ TESTS+=		opt-keep-going-multiple
+ TESTS+=		opt-m-include-dir
+ TESTS+=		opt-no-action
+-- 
+2.37.3
+