diff --git a/auto/config b/auto/config
index b995daa..7804827 100755
--- a/auto/config
+++ b/auto/config
@@ -165,6 +165,9 @@ EOF
 sed -e s/@VERSION@/"$VERSION_PRETTY"/g config/bootloaders/splash.svg.in > config/bootloaders/splash.svg
 mv -f config/bootloaders/splash.svg config/bootloaders/isolinux/
 
+# Update GRUB EFI menu for our flavor
+sed -e s/@FLAVOR@/"$FLAVOR"/g config/bootloaders/grub-efi.cfg.in > config/bootloaders/isolinux/grub-efi.cfg
+
 IMAGE_FILENAME=pureos-${dist_version}-${FLAVOR}_${CURRENT_DATE}
 
 lb config noauto \
diff --git a/config/bootloaders/grub-efi.cfg.in b/config/bootloaders/grub-efi.cfg.in
new file mode 100644
index 0000000..07812b4
--- /dev/null
+++ b/config/bootloaders/grub-efi.cfg.in
@@ -0,0 +1,33 @@
+if loadfont $prefix/font.pf2 ; then
+  set gfxmode=800x600
+  insmod efi_gop
+  insmod efi_uga
+  insmod video_bochs
+  insmod video_cirrus
+  insmod gfxterm
+  insmod png
+  terminal_output gfxterm
+fi
+
+if background_image /isolinux/splash.png; then
+  set color_normal=light-gray/black
+  set color_highlight=white/black
+else
+  set menu_color_normal=cyan/blue
+  set menu_color_highlight=white/blue
+fi
+
+insmod play
+play 480 440 1
+
+menuentry "Test or install PureOS (@FLAVOR@)" {
+	set gfxpayload=keep
+	linux	@LINUX@ boot=casper @APPEND_LIVE@ ---
+	initrd	@INITRD@
+}
+
+menuentry "Test or install PureOS (@FLAVOR@ failsafe)" {
+	set gfxpayload=keep
+	linux	@LINUX@ boot=casper @APPEND_LIVE_FAILSAFE@ ---
+	initrd	@INITRD@
+}