diff --git a/payloads/external/GRUB2/Makefile b/payloads/external/GRUB2/Makefile
index dee7f6973b..4a0a49106a 100644
--- a/payloads/external/GRUB2/Makefile
+++ b/payloads/external/GRUB2/Makefile
@@ -22,7 +22,7 @@ checkout:
 			git branch -f $(NAME-y) $(TAG-y) && \
 			git checkout $(NAME-y) || true
 
-config: checkout
+grub2/build/config.h: $(CONFIG_DEP) | checkout
 	echo "    CONFIG     GRUB2 $(NAME-y)"
 	rm -rf grub2/build
 	mkdir grub2/build
@@ -32,6 +32,8 @@ config: checkout
 	CFLAGS=-O2 TARGET_CFLAGS=-Os \
 	--with-platform=coreboot --enable-boot-time --disable-werror
 
+config: grub2/build/config.h checkout
+
 grub2: config
 	echo "    MAKE       GRUB2 $(NAME-y)"
 	$(MAKE) -C grub2/build
diff --git a/payloads/external/Makefile.inc b/payloads/external/Makefile.inc
index fb50604c75..0a9b3d6844 100644
--- a/payloads/external/Makefile.inc
+++ b/payloads/external/Makefile.inc
@@ -152,11 +152,12 @@ payloads/external/FILO/filo/build/version.h: filo
 
 # Grub
 
-grub2:
+grub2: $(obj)/config.h
 	$(MAKE) -C payloads/external/GRUB2 \
 			HOSTCC="$(HOSTCC)" \
 			CC="$(CC_x86_32)" LD="$(LD_x86_32)" \
 			OBJCOPY="$(OBJCOPY_x86_32)" STRIP="$(STRIP_x86_32)" \
+			CONFIG_DEP="$(abspath $(obj)/config.h)" \
 			CONFIG_GRUB2_MASTER=$(CONFIG_GRUB2_MASTER) \
 			CONFIG_GRUB2_REVISION=$(CONFIG_GRUB2_REVISION) \
 			CONFIG_GRUB2_REVISION_ID=$(CONFIG_GRUB2_REVISION_ID) \