diff --git a/srcpkgs/winusb/template b/srcpkgs/winusb/template
index c1d5715a0a7..40d572165fe 100644
--- a/srcpkgs/winusb/template
+++ b/srcpkgs/winusb/template
@@ -6,11 +6,21 @@ only_for_archs="i686 x86_64 i686-musl x86_64-musl"
 build_style=gnu-configure
 configure_args="--with-wx-config=wx-config-3.0"
 hostmakedepends="pkg-config"
-makedepends="wxWidgets-devel ntfs-3g parted grub-x86_64-efi desktop-file-utils hicolor-icon-theme"
+makedepends="wxWidgets-devel ntfs-3g parted desktop-file-utils hicolor-icon-theme"
 short_desc="Simple tool that enable you to create your own usb stick windows installer"
-depends="desktop-file-utils hicolor-icon-theme parted ntfs-3g grub-x86_64-efi"
+depends="desktop-file-utils hicolor-icon-theme parted ntfs-3g"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
 license="GPL-3"
 homepage="http://en.congelli.eu/prog_info_winusb.html"
 distfiles="ftp://ftp.freebsd.ch/gentoo/distfiles/winusb-${version}.tar.gz"
 checksum=7bd8d2e63651134bd4173dcf358708fb9e6de1677c088e67d45995a1d5066bc9
+
+case "${XBPS_TARGET_MACHINE}" in
+	x86_64*) depends+=" grub-x86_64-efi"; makedepends+=" grub-x86_64-efi" ;;
+	i686*) depends+=" grub-i386-efi"; makedepends+=" grub-i386-efi" ;;
+esac
+
+post_configure() {
+	sed -i Makefile src/Makefile \
+		-e"s;^\(CXXFLAGS *=\)\(.*\);\1 ${CXXFLAGS} \2;"
+}