diff --git a/temp/u-boot-librem5dev/0001-remove-dependency-on-git.patch b/temp/u-boot-librem5/0001-remove-dependency-on-git.patch
similarity index 100%
rename from temp/u-boot-librem5dev/0001-remove-dependency-on-git.patch
rename to temp/u-boot-librem5/0001-remove-dependency-on-git.patch
diff --git a/temp/u-boot-librem5dev/APKBUILD b/temp/u-boot-librem5/APKBUILD
similarity index 66%
rename from temp/u-boot-librem5dev/APKBUILD
rename to temp/u-boot-librem5/APKBUILD
index 1a666ffd3..0dd5f8432 100644
--- a/temp/u-boot-librem5dev/APKBUILD
+++ b/temp/u-boot-librem5/APKBUILD
@@ -1,12 +1,14 @@
-# Forked from Alpine, so we can build it with Librem 5 devkit support
-pkgname=u-boot-librem5dev
+# Forked from Alpine, so we can build it with Librem 5 phone support
+pkgname=u-boot-librem5
 pkgver=0.4
 pkgrel=0
-_atfversion="92c2de12d36b31938ce940d5cac3c30a98665237"
+# 'librem5' branch for devkit
+_atfversion="783fc2b2c4266bfdb5218e4d9b6b2bc90849e0e9"
+# 'busfreq' branch
 _ubootversion="54f300a32d00f3acebf7e6fcff210ad34e157eb9"
 _m4version="a017421c340a69f2392086da93841244f78a03c5"
 _firmwareversion="7.9"
-pkgdesc="u-boot bootloader for the Purism Librem5 devkit"
+pkgdesc="u-boot bootloader for the Purism Librem5 phone"
 url="http://www.denx.de/wiki/U-Boot/"
 arch="aarch64"
 license="GPL-2.0-or-later OFL-1.1 BSD-2-Clause BSD-3-Clause eCos-2.0 IBM-pibs"
@@ -48,26 +50,42 @@ build() {
 	make distclean
 	# Note: HOSTCC is set explicitly here else it tries to use cc, which
 	# doesn't exist on Alpine
+        #
+        # Devkit uboot firmware
 	make ARCH=arm HOSTCC=gcc librem5_devkit_defconfig
 	make ARCH=arm HOSTCC=gcc
         make ARCH=arm HOSTCC=gcc flash.bin
         make ARCH=arm HOSTCC=gcc u-boot.imx
+        mv flash.bin devkit-flash.bin
 
-	msg "Building u-boot flashing image"
+        # Phone uboot firmware
+        make distclean
+	make ARCH=arm HOSTCC=gcc librem5_defconfig
+	make ARCH=arm HOSTCC=gcc
+        make ARCH=arm HOSTCC=gcc flash.bin
+        make ARCH=arm HOSTCC=gcc u-boot.imx
+        mv flash.bin phone-flash.bin
+
+	msg "Building u-boot flashing images"
         dd if=/dev/zero of=devkit-boot.img bs=1024 count=1055
         dd if="$_m4builddir"/m4.bin conv=notrunc of="$_ubootbuilddir"/devkit-boot.img bs=1024
-        dd if="$_ubootbuilddir"/flash.bin conv=notrunc of="$_ubootbuilddir"/devkit-boot.img bs=1024 seek=31
+        dd if="$_ubootbuilddir"/devkit-flash.bin conv=notrunc of="$_ubootbuilddir"/devkit-boot.img bs=1024 seek=31
 
+        dd if=/dev/zero of=phone-boot.img bs=1024 count=1055
+        dd if="$_m4builddir"/m4.bin conv=notrunc of="$_ubootbuilddir"/phone-boot.img bs=1024
+        dd if="$_ubootbuilddir"/phone-flash.bin conv=notrunc of="$_ubootbuilddir"/phone-boot.img bs=1024 seek=31
 	msg "done!"
 }
 
 package() {
-	install -D -m644 "$_ubootbuilddir"/devkit-boot.img \
-		"$pkgdir/usr/share/firmware/librem5dev/devkit-boot.img"
+        install -D -m644 "$_ubootbuilddir"/devkit-boot.img \
+		"$pkgdir/usr/share/firmware/librem5/devkit-boot.img"
+	install -D -m644 "$_ubootbuilddir"/phone-boot.img \
+		"$pkgdir/usr/share/firmware/librem5/phone-boot.img"
 }
 
 
 sha512sums="6bcce8d553059dcde094b8a0bb352f1c8c8f33f5e59c3e1cde87d614bd785c929abe883b4ea6a72958c2849a6578dc06fe558e8d82180334ff0c1eb190a6a0ed  uboot-imx-54f300a32d00f3acebf7e6fcff210ad34e157eb9.tar.gz
 035a4358ddf586c829da7fa2fb0d9d1df913c0c454f2d0e57ff0c6794552e49950fb6373f9aaf72e0e4c78ab411496aabbc60bf66cd76e35053f7a2d77911735  m4-a017421c340a69f2392086da93841244f78a03c5.tar.gz
-cd8c9411ae0e57d2c8c700bf3e8c8d03e7dab955ace249a00911dd8c42b42929e0de3a5885eb9b1d945174abc8cfb177595d83c235e757c70640f451b62547ba  arm-trusted-firmware-92c2de12d36b31938ce940d5cac3c30a98665237.tar.gz
+d4366a775a6dbeab491087991238c55812371aa2d57279d01c49f0da2f0cfa60f6531609e53b79fb44c39b0e94fd5a2ddd2b13d77469d5588452f11de05ba40b  arm-trusted-firmware-783fc2b2c4266bfdb5218e4d9b6b2bc90849e0e9.tar.gz
 d7c221e0c1cc5a22c9b98ba369f481d690a2227b0897836fb0b18975f0d2f0a085f7a120d24bdd161850d32f878e7f1aa47015dee76f7b40e84f45adf379e22c  firmware-imx-7.9.bin"
diff --git a/temp/u-boot-librem5dev/README.txt b/temp/u-boot-librem5dev/README.txt
deleted file mode 100644
index c342913a6..000000000
--- a/temp/u-boot-librem5dev/README.txt
+++ /dev/null
@@ -1,32 +0,0 @@
-WandBoard
----------
-
-- ROM loads boot loader from raw MMC sectors at fixed address
-- NOTE: 1st partition needs to start after boot loader
-
-- Install u-boot with:
-  dd if=wandboard/SPL of=/dev/mmcblk0 bs=1k seek=1
-  dd if=wandboard/u-boot.img of=/dev/mmcblk0 bs=1k seek=69
-  sync
-
-  (Note - the SD card node may vary, so adjust this as needed).
-
-- Insert the SD card into the slot located in the bottom of the board
-  (same side as the mx6 processor)
-
-BeagleBoard
------------
-
-- ROM looks for 1st partition with FAT, and loads MLO from it
-- NOTE: MLO needs to be the first file created on this partition
-
-- Install u-boot with:
-  cp am335x_boneblack/{MLO,u-boot.img} /media/mmcblk0p1/
-
-Sunxi (Cubie* etc)
-------------------
-
-- ROM loads boot loader from SD-CARD sectors at fixed address
-- Install u-boot with:
-    sudo dd if=<board>/u-boot-sunxi-with-spl.bin of=/dev/sda bs=1024 seek=8
-