diff --git a/firmware/beta/recovery.bin b/firmware/beta/recovery.bin
new file mode 100644
index 0000000..c2b40c9
Binary files /dev/null and b/firmware/beta/recovery.bin differ
diff --git a/firmware/recovery.bin b/firmware/critical/recovery.bin
similarity index 100%
rename from firmware/recovery.bin
rename to firmware/critical/recovery.bin
diff --git a/rpi-eeprom-update b/rpi-eeprom-update
index 597b7ea..08b1ad9 100755
--- a/rpi-eeprom-update
+++ b/rpi-eeprom-update
@@ -17,7 +17,7 @@ FIRMWARE_RELEASE_STATUS=${FIRMWARE_RELEASE_STATUS:-critical}
 FIRMWARE_IMAGE_DIR=${FIRMWARE_IMAGE_DIR:-${FIRMWARE_ROOT}/${FIRMWARE_RELEASE_STATUS}}
 FIRMWARE_BACKUP_DIR=${FIRMWARE_BACKUP_DIR:-/var/lib/raspberrypi/bootloader/backup}
 USE_FLASHROM=${USE_FLASHROM:-0}
-RECOVERY_BIN=${RECOVERY_BIN:-${FIRMWARE_ROOT}/recovery.bin}
+RECOVERY_BIN=${RECOVERY_BIN:-${FIRMWARE_ROOT}/${FIRMWARE_RELEASE_STATUS}/recovery.bin}
 BOOTFS=${BOOTFS:-/boot}
 
 EXIT_SUCCESS=0
diff --git a/test/install b/test/install
new file mode 100755
index 0000000..be30017
--- /dev/null
+++ b/test/install
@@ -0,0 +1,30 @@
+#!/bin/sh
+
+# Convenience script for updating the rpi-eeprom updater via a git
+# clone instead of apt install.
+
+# For test & debug only.
+
+set -e
+
+script_dir="$(cd "$(dirname "$0")" && pwd)"
+
+die() {
+  echo "$@" >&2
+  exit 1
+}
+
+FIRMWARE_DIR="${script_dir}/../firmware"
+CONFIG="/etc/default/rpi-eeprom-update"
+
+[ "$(id -u)" = "0" ] || die "$0 Must be run as root - try 'sudo $0 [-b]'"
+
+cp -rfv "${FIRMWARE_DIR}"/* /lib/firmware/raspberrypi/bootloader
+cp -fv "${script_dir}/../rpi-eeprom-config" /usr/bin
+cp -fv "${script_dir}/../rpi-eeprom-update" /usr/bin
+
+cp -fv "${script_dir}/../rpi-eeprom-update-default" /etc/default/rpi-eeprom-update
+
+if [ "$1" = "-b" ]; then
+   sed -i -e 's/^FIRMWARE_RELEASE_STATUS=.*/FIRMWARE_RELEASE_STATUS=beta/' "${CONFIG}"
+fi