diff --git a/srcpkgs/bmake/patches/disable-tests-for-cross.patch b/srcpkgs/bmake/patches/disable-tests-for-cross.patch
new file mode 100644
index 0000000000..a559df3621
--- /dev/null
+++ b/srcpkgs/bmake/patches/disable-tests-for-cross.patch
@@ -0,0 +1,30 @@
+Do not execute unit-tests, will fail in cross compilation.
+
+--- bmake/boot-strap.orig	2014-02-17 14:39:17.600113770 +0100
++++ bmake/boot-strap	2014-02-17 14:39:32.262930460 +0100
+@@ -407,9 +407,6 @@ op_build() {
+ 	[ -s make-bootstrap.sh ] || op_configure
+ 	chmod 755 make-bootstrap.sh || exit 1
+ 	./make-bootstrap.sh || exit 1
+-	case "$op" in
+-	build) op_test;;
+-	esac
+ }
+ 
+ op_test() {
+@@ -428,7 +425,6 @@ op_clean() {
+ }
+ 
+ op_install() {
+-	op_test
+ 	case "$INSTALL_PREFIX,$INSTALL_BIN,$prefix" in
+ 	,$HOST_TARGET/bin,*/$HOST_TARGET)
+ 		INSTALL_PREFIX=`dirname $prefix`
+@@ -443,7 +439,6 @@ op_all() {
+ 	if [ -n "$INSTALL_PREFIX" ]; then
+ 		op_install
+ 	else
+-		op_test
+ 		MAKE_VERSION=`sed -n '/^MAKE_VERSION/ { s,.*=  *,,;p; }' $srcdir/Makefile`
+ 		echo You can install by running:
+ 		echo
diff --git a/srcpkgs/bmake/template b/srcpkgs/bmake/template
new file mode 100644
index 0000000000..6e2f63e37a
--- /dev/null
+++ b/srcpkgs/bmake/template
@@ -0,0 +1,39 @@
+# Template file for 'bmake'
+pkgname=bmake
+version=20140620
+revision=1
+create_wrksrc=yes
+short_desc="Portable version of the NetBSD make build tool"
+maintainer="Juan RP <xtraeme@gmail.com>"
+license="BSD"
+homepage="http://www.crufty.net/help/sjg/bmake.html"
+distfiles="http://www.crufty.net/ftp/pub/sjg/bmake-${version}.tar.gz"
+checksum=bd9d24d131a78c1ab77b1d2e165317549e2df88637b8caa169e985f725469626
+
+do_configure() {
+	cd bmake
+	if [ "$CROSS_BUILD" ]; then
+		mkdir -p bmake-host
+		cd bmake-host
+		# Build a native bmake for installation
+		unset CC LD AR CFLAGS
+		../boot-strap op=build
+		cp linux*-*/bmake .
+	fi
+}
+do_build() {
+	mkdir -p bmake/bmake-build
+	cd bmake/bmake-build
+	if [ "$CROSS_BUILD" ]; then
+		_args="--host=${XBPS_CROSS_TRIPLET}"
+	fi
+	../boot-strap ${_args} --prefix=/usr op=build
+}
+
+do_install() {
+	cd bmake/bmake-build
+	if [ "$CROSS_BUILD" ]; then
+		sed -i "s,^BMAKE=$,BMAKE=${wrksrc}/bmake/bmake-host/bmake," ../boot-strap
+	fi
+	../boot-strap --prefix=/usr --install-destdir=${DESTDIR} op=install
+}