diff --git a/srcpkgs/grub/template b/srcpkgs/grub/template
index 7190360c49..5f29b9659b 100644
--- a/srcpkgs/grub/template
+++ b/srcpkgs/grub/template
@@ -1,7 +1,7 @@
 # Template file for 'grub'
 pkgname=grub
-version="2.00"
-revision=10
+version=2.00
+revision=11
 short_desc="GRand Unified Bootloader 2"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-3"
@@ -13,6 +13,8 @@ makedepends="flex libusb-compat-devel ncurses-devel freetype-devel
  liblzma-devel device-mapper-devel font-unifont-bdf fuse-devel"
 
 do_configure() {
+	unset CC AS LD RANLIB CPP
+
 	configure_args+=" --enable-device-mapper --enable-cache-stats --enable-nls
 		--enable-grub-mkfont --enable-grub-mount --disable-werror "
 
@@ -35,19 +37,19 @@ do_configure() {
 do_build() {
 	msg_normal "Building BIOS grub...\n"
 	cd $wrksrc/bios_build
-	make CPP= ${makejobs}
+	make ${makejobs}
 
 	if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
 		msg_normal "Building EFI grub...\n"
 		cd $wrksrc/efi_build
-		make CPP= ${makejobs}
+		make ${makejobs}
 	fi
 }
 
 do_install() {
 	if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
 		cd $wrksrc/efi_build
-		make CPP= DESTDIR=$DESTDIR/efi install
+		make DESTDIR=$DESTDIR/efi install
 		# Remove non-platform specific files
 		rm -rf ${DESTDIR}/efi/{boot,etc,usr/{share,bin,sbin}}
 		rm -f ${DESTDIR}/efi/usr/lib/grub/x86_64-efi/x86_64-*
@@ -56,7 +58,7 @@ do_install() {
 		rmdir ${DESTDIR}/efi
 	fi
 	cd $wrksrc/bios_build
-	make CPP= DESTDIR=$DESTDIR install
+	make DESTDIR=$DESTDIR install
 
 	# Required to compress info files.
 	vmkdir usr/share/info