diff --git a/groups.d/010.host_deps.group b/groups.d/010.host_deps.group
index 580be8b..2a45321 100644
--- a/groups.d/010.host_deps.group
+++ b/groups.d/010.host_deps.group
@@ -39,11 +39,11 @@ HOST_DEPS_TOOLS_RPM_DISABLE=1;
 : ${PKG_BISON_HOST_ENV_VARS_EXTRA:="M4=${PREFIX}/bin/m4"};
 
 : ${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_URL:=https://srcbase.foss21.org/base/bmake/srcbase.bmake-${PKG_BMAKE_HOST_VERSION}.tar.xz};
+: ${PKG_BMAKE_HOST_SHA256SUM:=4b760506cd1fdada8c1012558e78530ccd2deaa29aeb463411bc9d8755a40a7e};
 : ${PKG_BMAKE_HOST_SUBDIR:=bmake-20240401};
 : ${PKG_BMAKE_HOST_CONFIGURE_TYPE:="sofort"};
-: ${PKG_BMAKE_HOST_CONFIGURE_ARGS:=--prefix=};
+: ${PKG_BMAKE_HOST_CONFIGURE_ARGS:="--prefix= --with-default-sys-path=${PREFIX}/share/mk"};
 
 : ${PKG_BZIP2_HOST_SHA256SUM:=ab5a03176ee106d3f0fa90e381da478ddae405918153cca248e682cd0c4a2269};
 : ${PKG_BZIP2_HOST_VERSION:=1.0.8};
diff --git a/groups.d/231.native_packages_etc.group b/groups.d/231.native_packages_etc.group
index e19cae0..6e3e5a3 100644
--- a/groups.d/231.native_packages_etc.group
+++ b/groups.d/231.native_packages_etc.group
@@ -30,8 +30,8 @@ zstd";
 : ${PKG_BDWGC_CONFIGURE_ARGS_EXTRA:="--enable-threads=posix --enable-parallel-mark --enable-handle-fork"};
 
 : ${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_URL:=https://srcbase.foss21.org/base/bmake/srcbase.bmake-${PKG_BMAKE_HOST_VERSION}.tar.xz};
+: ${PKG_BMAKE_SHA256SUM:=4b760506cd1fdada8c1012558e78530ccd2deaa29aeb463411bc9d8755a40a7e};
 : ${PKG_BMAKE_SUBDIR:=bmake-20240401};
 : ${PKG_BMAKE_CONFIGURE_TYPE:="sofort"};
 : ${PKG_BMAKE_CONFIGURE_ARGS:=--prefix=};