diff --git a/payloads/external/FILO/Makefile.inc b/payloads/external/FILO/Makefile.inc
index 311b3c8d84..72f86bc35a 100644
--- a/payloads/external/FILO/Makefile.inc
+++ b/payloads/external/FILO/Makefile.inc
@@ -1,5 +1,5 @@
-TAG-$(CONFIG_FILO_MASTER)=
-NAME-$(CONFIG_FILO_MASTER)=HEAD
+TAG-$(CONFIG_FILO_MASTER)=origin/master
+NAME-$(CONFIG_FILO_MASTER)=MASTER
 TAG-$(CONFIG_FILO_STABLE)=4dbb31a64fe5b1c7e3025ab34619220609897646
 NAME-$(CONFIG_FILO_STABLE)=STABLE
 
@@ -13,7 +13,7 @@ checkout:
 		git clone http://review.coreboot.org/p/filo.git
 	cd filo && \
 		git checkout master && \
-		git pull; \
+		git remote update && \
 		test -n $(TAG-y) && \
 			git branch -f $(NAME-y) $(TAG-y) && \
 			git checkout $(NAME-y)
@@ -21,14 +21,11 @@ checkout:
 config: libpayload
 	echo "    CONFIG     FILO $(NAME-y)"
 	$(MAKE) -C filo defconfig LIBCONFIG_PATH=../../../libpayload
-	echo "CONFIG_COREBOOT=y" >> filo/.config
-	echo "CONFIG_DEBUG_SERIAL=y" >> filo/.config
-	echo "CONFIG_COREBOOT_FLASH=y" >> filo/.config
-	echo "CONFIG_LZMA=y" >> filo/.config
-	echo "CONFIG_FLASH_FLOPPY=y" >> filo/.config
-	echo "CONFIG_VGAHOOKS=y" >> filo/.config
+	# This shows how to force a previously unset .config option *on*
+	#echo "CONFIG_VGAHOOKS=y" >> filo/.config
 	# This shows how to force a previously set .config option *off*
 	#echo "# CONFIG_SMBIOS is not set" >> filo/.config
+	$(MAKE) -C filo oldconfig LIBCONFIG_PATH=../../../libpayload
 
 filo: config
 	echo "    MAKE       FILO $(NAME-y)"