diff --git a/srcpkgs/odroid-c2-uboot/template b/srcpkgs/odroid-c2-uboot/template
index 1e0b16520a7..51053778251 100644
--- a/srcpkgs/odroid-c2-uboot/template
+++ b/srcpkgs/odroid-c2-uboot/template
@@ -6,6 +6,7 @@ _githash=f416a769454b89c39d5b217d28bd3c9f5d1594df
 wrksrc="u-boot-${_githash}"
 only_for_archs="aarch64 aarch64-musl"
 conf_files="/boot/boot.ini"
+hostmakedepends="bc"
 short_desc="Odroid C2 U-Boot files for SD booting"
 maintainer="Christian Neukirchen <chneukirchen@gmail.com>"
 license="GPL-2"
@@ -13,23 +14,33 @@ homepage="https://github.com/hardkernel/u-boot"
 distfiles="https://github.com/hardkernel/u-boot/archive/${_githash}.tar.gz"
 checksum=da7ca9e6abdfedaa65ac4e0bd378155002bf5d0ccea663ddf03fa839dceb3724
 
+case "$XBPS_MACHINE" in
+	x86_64) ;;
+	*) msg_error "Can only be built from x86_64: https://github.com/hardkernel/u-boot/issues/23\n" ;;
+esac
+
+make_build_args="ARCH=arm"
+if [ "$CROSS_BUILD" ]; then
+	make_build_args+=" CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-"
+else
+	make_build_args+=" HOSTARCH=arm"
+fi
+
 post_extract() {
 	touch include/stddef.h  # musl hack
+	sed -i '1itypedef unsigned long ulong;' \
+		include/image.h tools/mkimage.h tools/proftool.c
 }
 do_configure() {
 	unset CFLAGS CXXFLAGS LDFLAGS
 
-	make distclean CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-
-	make odroidc2_config CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-
+	make ${make_build_args} distclean
+	make ${make_build_args} odroidc2_config
 }
 do_build() {
 	unset CFLAGS CXXFLAGS LDFLAGS
-  
-	if [ "$CROSS_BUILD" ]; then
-		make ARCH=arm CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-
-	else
-		make ARCH=arm
-	fi
+
+	make ${makejobs} ${make_build_args}
 }
 do_install() {
 	vmkdir boot