diff --git a/groups.d/010.host_deps.group b/groups.d/010.host_deps.group
index de68f59..580be8b 100644
--- a/groups.d/010.host_deps.group
+++ b/groups.d/010.host_deps.group
@@ -37,11 +37,14 @@ HOST_DEPS_TOOLS_RPM_DISABLE=1;
 : ${PKG_BISON_HOST_VERSION:=3.7.6};
 : ${PKG_BISON_HOST_URL:=https://ftp.gnu.org/gnu/bison/bison-${PKG_BISON_HOST_VERSION}.tar.xz};
 : ${PKG_BISON_HOST_ENV_VARS_EXTRA:="M4=${PREFIX}/bin/m4"};
-: ${PKG_BMAKE_HOST_URLS_GIT:="bmake=https://github.com/arichardson/bmake@master"};
-: ${PKG_BMAKE_HOST_CONFIGURE_ARGS:=--with-default-sys-path=${PREFIX}/share/mk};
-: ${PKG_BMAKE_HOST_CFLAGS_BUILD_EXTRA:="-fcommon"};
-: ${PKG_BMAKE_HOST_LDFLAGS_BUILD_EXTRA:="-fcommon"};
-: ${PKG_BMAKE_HOST_MAKEFLAGS_LOADAVG:="none"};
+
+: ${PKG_BMAKE_HOST_VERSION:=20240401};
+: ${PKG_BMAKE_HOST_URL:=https://srcbase.foss21.org/bmake/srcbase.bmake-${PKG_BMAKE_HOST_VERSION}.tar.xz};
+: ${PKG_BMAKE_HOST_SHA256SUM:=38c81760e9021f5b8e00025a159e4819203cadb0d55d0597842ac0dc38709561};
+: ${PKG_BMAKE_HOST_SUBDIR:=bmake-20240401};
+: ${PKG_BMAKE_HOST_CONFIGURE_TYPE:="sofort"};
+: ${PKG_BMAKE_HOST_CONFIGURE_ARGS:=--prefix=};
+
 : ${PKG_BZIP2_HOST_SHA256SUM:=ab5a03176ee106d3f0fa90e381da478ddae405918153cca248e682cd0c4a2269};
 : ${PKG_BZIP2_HOST_VERSION:=1.0.8};
 : ${PKG_BZIP2_HOST_URL:=https://sourceware.org/pub/bzip2/bzip2-${PKG_BZIP2_HOST_VERSION}.tar.gz};
diff --git a/groups.d/231.native_packages_etc.group b/groups.d/231.native_packages_etc.group
index 870b01e..e19cae0 100644
--- a/groups.d/231.native_packages_etc.group
+++ b/groups.d/231.native_packages_etc.group
@@ -28,10 +28,14 @@ zstd";
 : ${PKG_BDWGC_DEPENDS:="libatomic_ops"};
 : ${PKG_BDWGC_URLS_GIT:="bdwgc=https://github.com/ivmai/bdwgc@master"};
 : ${PKG_BDWGC_CONFIGURE_ARGS_EXTRA:="--enable-threads=posix --enable-parallel-mark --enable-handle-fork"};
-: ${PKG_BMAKE_URLS_GIT:="bmake=https://github.com/arichardson/bmake@master"};
-: ${PKG_BMAKE_CONFIGURE_ARGS="-C --host=${DEFAULT_TARGET} --prefix=/usr --target=${DEFAULT_TARGET}"};
-: ${PKG_BMAKE_ENV_VARS_EXTRA:="BMAKE=${PREFIX}/bin/bmake"};
-: ${PKG_BMAKE_MAKEFLAGS_LOADAVG:="none"};
+
+: ${PKG_BMAKE_VERSION:=20240401};
+: ${PKG_BMAKE_URL:=https://srcbase.foss21.org/bmake/srcbase.bmake-${PKG_BMAKE_HOST_VERSION}.tar.xz};
+: ${PKG_BMAKE_SHA256SUM:=38c81760e9021f5b8e00025a159e4819203cadb0d55d0597842ac0dc38709561};
+: ${PKG_BMAKE_SUBDIR:=bmake-20240401};
+: ${PKG_BMAKE_CONFIGURE_TYPE:="sofort"};
+: ${PKG_BMAKE_CONFIGURE_ARGS:=--prefix=};
+
 : ${PKG_BOCHS_DEPENDS:="curl ncurses sdl1"};
 : ${PKG_BOCHS_SHA256SUM:=a010ab1bfdc72ac5a08d2e2412cd471c0febd66af1d9349bc0d796879de5b17a};
 : ${PKG_BOCHS_VERSION:=2.7};
diff --git a/patches/bmake.local.patch b/patches/bmake.local.patch
deleted file mode 100644
index 20d4552..0000000
--- a/patches/bmake.local.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- bmake/boot-strap.orig	2020-02-08 19:30:56.653565539 +0000
-+++ bmake/boot-strap	2020-02-11 11:45:44.426114614 +0000
-@@ -202,7 +202,6 @@
- fi
- 
- op=all
--BMAKE=
- 
- while :
- do
-@@ -391,7 +390,7 @@
- 	    cd $Mydir &&
- 	    MAKESYSPATH=$mksrc SRCTOP=$Mydir OBJTOP=$objdir \
- 	    MAKEOBJDIR='${.CURDIR:S,${SRCTOP:tA},${OBJTOP:tA},}' \
--	    ${BMAKE:-$objdir/bmake} -f $Mydir/Makefile "$@"
-+	    ${BMAKE} -f $Mydir/Makefile TEST_MAKE="${BMAKE}" "$@"
-     )
- }
- 
---- bmake/install-sh.orig	2020-02-15 15:51:24.856000000 +0000
-+++ bmake/install-sh	2020-02-20 15:52:47.596000000 +0000
-@@ -1,3 +1,4 @@
-+#!/bin/sh
- :
- # NAME:
- #	install.sh - portable version of install(1)
---- bmake/makefile.in.orig	2022-12-26 19:16:39.881930779 +0100
-+++ bmake/makefile.in	2023-03-23 18:09:58.883692945 +0100
-@@ -9,6 +9,6 @@
- all: build
- 
- build clean install test:
--	${srcdir}/boot-strap --prefix=${prefix} -o . op=$@
-+	MAKEFLAGS="${MAKEFLAGS%*--jobserver-auth=[0-9],[0=9]*}" ${srcdir}/boot-strap --prefix=${prefix} -o . op=$@
- 
- 		
diff --git a/patches/bmake_host.local.patch b/patches/bmake_host.local.patch
deleted file mode 100644
index 0999df4..0000000
--- a/patches/bmake_host.local.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- bmake/install-sh.orig	2020-02-15 15:51:24.856000000 +0000
-+++ bmake/install-sh	2020-02-20 15:52:47.596000000 +0000
-@@ -1,3 +1,4 @@
-+#!/bin/sh
- :
- # NAME:
- #	install.sh - portable version of install(1)
---- bmake/makefile.in.orig	2022-12-26 19:16:39.881930779 +0100
-+++ bmake/makefile.in	2023-03-23 18:09:58.883692945 +0100
-@@ -9,6 +9,6 @@
- all: build
- 
- build clean install test:
--	${srcdir}/boot-strap --prefix=${prefix} -o . op=$@
-+	MAKEFLAGS="${MAKEFLAGS%*--jobserver-auth=[0-9],[0=9]*}" ${srcdir}/boot-strap --prefix=${prefix} -o . op=$@
- 
- 		
diff --git a/patches/bmake_host/gcc10.patch b/patches/bmake_host/gcc10.patch
deleted file mode 100644
index 18e3e13..0000000
--- a/patches/bmake_host/gcc10.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -ru bmake.orig/job.c bmake/job.c
---- bmake.orig/job.c	2020-04-09 14:03:57.232919836 +0200
-+++ bmake/job.c	2020-06-14 22:19:09.776490793 +0200
-@@ -180,6 +180,8 @@
- #define ABORT_WAIT	3   	    /* Waiting for jobs to finish */
- #define JOB_TOKENS	"+EI+"	    /* Token to requeue for each abort state */
- 
-+FILE *debug_file;
-+
- /*
-  * this tracks the number of tokens currently "out" to build jobs.
-  */
-diff -ru bmake.orig/make.h bmake/make.h
---- bmake.orig/make.h	2020-02-10 18:07:01.708744511 +0100
-+++ bmake/make.h	2020-06-14 22:18:24.965773603 +0200
-@@ -464,7 +464,7 @@
-  *	There is one bit per module.  It is up to the module what debug
-  *	information to print.
-  */
--FILE *debug_file;		/* Output written here - default stdout */
-+extern FILE *debug_file;	/* Output written here - default stdout */
- extern int debug;
- #define	DEBUG_ARCH	0x00001
- #define	DEBUG_COND	0x00002