diff --git a/vars/build.vars b/vars/build.vars
index f1ceb96..76aead8 100644
--- a/vars/build.vars
+++ b/vars/build.vars
@@ -150,13 +150,15 @@ gl_cv_C_locale_sans_EILSEQ=yes"};
 HOST_TOOLS_BUILD_TYPE="host";
 HOST_TOOLS_CONFIGURE_ARGS="--disable-nls --prefix= --target=${DEFAULT_TARGET}";
 HOST_TOOLS_PACKAGES="
-chainport_host slibtool_host mdso_host mpackage_host perk_host install_strip_host pkgconf_host";
+chainport_host slibtool_host bmake_host mdso_host mpackage_host perk_host install_strip_host pkgconf_host texinfo_host";
 HOST_TOOLS_PREFIX="${PREFIX}";
 : ${PKG_CHAINPORT_HOST_URLS_GIT:="chainport=${DEFAULT_GITROOT}/ports/chainport"};
 : ${PKG_CHAINPORT_HOST_BUILD_STEPS_DISABLE:=build};
 : ${PKG_CHAINPORT_HOST_NO_LOG_VARS:=1};
 : ${PKG_SLIBTOOL_HOST_URLS_GIT:="slibtool=${DEFAULT_GITROOT}/slibtool"};
 : ${PKG_SLIBTOOL_HOST_CONFIGURE_ARGS:=--prefix=};
+: ${PKG_BMAKE_HOST_URLS_GIT:="bmake=https://github.com/arichardson/bmake@master"};
+: ${PKG_BMAKE_HOST_MAKEFLAGS_BUILD:=-j1};
 : ${PKG_MDSO_HOST_URLS_GIT:="mdso=${DEFAULT_GITROOT}/mdso"};
 : ${PKG_MDSO_HOST_CONFIGURE_ARGS:="--prefix="};
 : ${PKG_MDSO_HOST_INSTALL_FILES:="@mdso=bin/${DEFAULT_TARGET}-mdso /=${DEFAULT_TARGET}/bin bin/mdso=${DEFAULT_TARGET}/bin/mdso"};
@@ -177,6 +179,10 @@ HOST_TOOLS_PREFIX="${PREFIX}";
 : ${PKG_PKGCONF_HOST_URL:=https://distfiles.dereferenced.org/pkgconf/pkgconf-${PKG_PKGCONF_HOST_VERSION}.tar.xz};
 : ${PKG_PKGCONF_HOST_CONFIGURE_ARGS:="--prefix=${PREFIX} --with-system-libdir=${PREFIX_NATIVE}/lib --with-system-includedir=${PREFIX_NATIVE}/include --with-pkg-config-dir=${PREFIX_NATIVE}/lib/pkgconfig --with-personality-dir=${PREFIX_NATIVE}/share/pkgconfig/personality.d"};
 : ${PKG_PKGCONF_HOST_MAKEFLAGS_INSTALL_EXTRA:=prefix=};
+: ${PKG_TEXINFO_HOST_SHA256SUM:=988403c1542d15ad044600b909997ba3079b10e03224c61188117f3676b02caa};
+: ${PKG_TEXINFO_HOST_VERSION:=6.7};
+: ${PKG_TEXINFO_HOST_URL:=https://ftp.gnu.org/gnu/texinfo/texinfo-${PKG_TEXINFO_HOST_VERSION}.tar.xz};
+: ${PKG_TEXINFO_HOST_LIBTOOL:=rdlibtool};
 
 #
 # Build target host_tools_deps
@@ -226,7 +232,7 @@ HOST_TOOLS_RPM_PREFIX="${PREFIX}";
 HOST_TOOLCHAIN_DEPS_BUILD_TYPE="host";
 HOST_TOOLCHAIN_DEPS_CONFIGURE_ARGS="--disable-nls --prefix=";
 HOST_TOOLCHAIN_DEPS_PACKAGES="
-gmp_host mpfr_host mpc_host psxtypes_host texinfo_host";
+gmp_host mpfr_host mpc_host psxtypes_host";
 HOST_TOOLCHAIN_DEPS_PREFIX="${PREFIX_CROSS}";
 : ${PKG_GMP_HOST_SHA256SUM:=5275bb04f4863a13516b2f39392ac5e272f5e1bb8057b18aec1c9b79d73d8fb2};
 : ${PKG_GMP_HOST_VERSION:=6.1.2};
@@ -244,10 +250,6 @@ HOST_TOOLCHAIN_DEPS_PREFIX="${PREFIX_CROSS}";
 : ${PKG_PSXTYPES_HOST_URLS_GIT:=psxtypes=${DEFAULT_GITROOT}/psxtypes};
 : ${PKG_PSXTYPES_HOST_BUILD_STEPS_DISABLE:=build};
 : ${PKG_PSXTYPES_HOST_IN_TREE:=1};
-: ${PKG_TEXINFO_HOST_SHA256SUM:=988403c1542d15ad044600b909997ba3079b10e03224c61188117f3676b02caa};
-: ${PKG_TEXINFO_HOST_VERSION:=6.7};
-: ${PKG_TEXINFO_HOST_URL:=https://ftp.gnu.org/gnu/texinfo/texinfo-${PKG_TEXINFO_HOST_VERSION}.tar.xz};
-: ${PKG_TEXINFO_HOST_LIBTOOL:=rdlibtool};
 
 #
 # Build target host_toolchain