diff --git a/temp/u-boot-librem5/0001-librem5-enable-console-on-UART4.patch b/device/main/u-boot-librem5/0001-librem5-enable-console-on-UART4.patch
similarity index 100%
rename from temp/u-boot-librem5/0001-librem5-enable-console-on-UART4.patch
rename to device/main/u-boot-librem5/0001-librem5-enable-console-on-UART4.patch
diff --git a/temp/u-boot-librem5/APKBUILD b/device/main/u-boot-librem5/APKBUILD
similarity index 96%
rename from temp/u-boot-librem5/APKBUILD
rename to device/main/u-boot-librem5/APKBUILD
index 0910c1e0a..22566fbe9 100644
--- a/temp/u-boot-librem5/APKBUILD
+++ b/device/main/u-boot-librem5/APKBUILD
@@ -1,4 +1,6 @@
-# Forked from Alpine, so we can build it with Librem 5 phone support
+# Mainline u-boot with Librem 5 support and config
+# Maintainer: Clayton Craft <clayton@craftyguy.net>
+# Co-Maintainer: Bhushan Shah <bshah@kde.org>
 pkgname=u-boot-librem5
 pkgver=2022.04_rc1_git20220214
 pkgrel=0
diff --git a/temp/u-boot-librem5/u-boot-librem5-devkit.post-upgrade b/device/main/u-boot-librem5/u-boot-librem5-devkit.post-upgrade
similarity index 100%
rename from temp/u-boot-librem5/u-boot-librem5-devkit.post-upgrade
rename to device/main/u-boot-librem5/u-boot-librem5-devkit.post-upgrade
diff --git a/temp/u-boot-librem5/u-boot-librem5.post-upgrade b/device/main/u-boot-librem5/u-boot-librem5.post-upgrade
similarity index 100%
rename from temp/u-boot-librem5/u-boot-librem5.post-upgrade
rename to device/main/u-boot-librem5/u-boot-librem5.post-upgrade
diff --git a/temp/u-boot-librem5/update-u-boot b/device/main/u-boot-librem5/update-u-boot
similarity index 100%
rename from temp/u-boot-librem5/update-u-boot
rename to device/main/u-boot-librem5/update-u-boot