diff --git a/debian/changelog b/debian/changelog
index 5317b03..625c2ec 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+raspi-config (20200707) buster; urgency=medium
+
+  * Add boot ROM and boot order selection
+
+ -- Simon Long <simon@raspberrypi.com>  Tue, 07 Jul 2020 09:24:56 +0100
+
 raspi-config (20200601) buster; urgency=medium
 
   * Fix audio device check bug when used in non-English locale
diff --git a/raspi-config b/raspi-config
index d8922af..2809968 100755
--- a/raspi-config
+++ b/raspi-config
@@ -1258,11 +1258,11 @@ do_boot_rom() {
   if [ $? -eq 0 ]; then
     case "$BOOTOPT" in
       E1*)
-        sed /etc/default/rpi-eeprom-update -i -e "s/FIRMWARE_RELEASE_STATUS.*/FIRMWARE_RELEASE_STATUS=\"stable\"/"
+        sed /etc/default/rpi-eeprom-update -i -e "s/^FIRMWARE_RELEASE_STATUS.*/FIRMWARE_RELEASE_STATUS=\"stable\"/"
         EETYPE="Latest version"
         ;;
       E2*)
-        sed /etc/default/rpi-eeprom-update -i -e "s/FIRMWARE_RELEASE_STATUS.*/FIRMWARE_RELEASE_STATUS=\"critical\"/"
+        sed /etc/default/rpi-eeprom-update -i -e "s/^FIRMWARE_RELEASE_STATUS.*/FIRMWARE_RELEASE_STATUS=\"critical\"/"
         EETYPE="Factory default"
         ;;
       *)