diff --git a/alarm/uboot-tools/PKGBUILD b/alarm/uboot-tools/PKGBUILD
deleted file mode 100644
index dc42cdb1e..000000000
--- a/alarm/uboot-tools/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# Maintainer: Kevin Mihelich <kevin@archlinuxarm.org>
-# Contributor: Jonny Gerold <jonny@fsk141.com>
-# Contributor: Julian Langschaedel <meta.rb@gmail.com>
-
-pkgname=uboot-tools
-pkgver=2021.01
-pkgrel=1
-pkgdesc="U-Boot Tools"
-arch=('arm' 'armv6h' 'armv7h' 'aarch64')
-license=('GPL' 'LGPL')
-provides=('uboot-env' 'uboot-mkimage')
-replaces=('uboot-env' 'uboot-mkimage')
-backup=(etc/fw_env.config)
-source=(https://ftp.denx.de/pub/u-boot/u-boot-$pkgver.tar.bz2
-        fw_env.config)
-md5sums=('a3206df1c1b97df7a4ddcdd17cb97d0c'
-         '5a9dcbae5957f8621080d4bbc0e1520f')
-
-build() {
-  cd u-boot-${pkgver}
-
-  make defconfig
-  make tools-all CONFIG_KIRKWOOD=y
-}
-
-package() {
-  cd u-boot-${pkgver}
-
-  install -dm755 ${pkgdir}/{usr/{bin,share/man/man1},etc}
-  install -m755 tools/{fit_{check_sign,info},dumpimage,mkimage,mkenvimage,netconsole,ncb,proftool,env/fw_printenv,kwboot} ${pkgdir}/usr/bin
-  ln -s /usr/bin/fw_printenv ${pkgdir}/usr/bin/fw_setenv
-  install -m644 ${srcdir}/fw_env.config ${pkgdir}/etc
-  install -m644 doc/{mkimage,kwboot}.1 ${pkgdir}/usr/share/man/man1
-}
diff --git a/alarm/uboot-tools/fw_env.config b/alarm/uboot-tools/fw_env.config
deleted file mode 100644
index e51f78511..000000000
--- a/alarm/uboot-tools/fw_env.config
+++ /dev/null
@@ -1,20 +0,0 @@
-# Configuration file for fw_(printenv/saveenv) utility.
-# Up to two entries are valid, in this case the redundand
-# environment sector is assumed present.
-# MTD device name       Device offset   Env. size       Flash sector size
-#/dev/mtd2               0x0000          0x20000         0x20000
-
-# segate dockstar:
-# /dev/mtd0               0xc0000         0x20000         0x20000
-
-# iomega iconnect
-# /dev/mtd0               0xa0000         0x20000         0x20000
-
-# CuBox
-# /dev/mtd0               0xc0000         0x10000         0x10000
-
-# CuBox-i/Hummingboard
-# /dev/mmcblk0              0x60000         0x2000         0x2000
-
-# Utilite 1
-# /dev/mtd1               0x0000          0x2000          0x2000 
diff --git a/community/uboot-tools/PKGBUILD b/community/uboot-tools/PKGBUILD
new file mode 100644
index 000000000..a846dd6d2
--- /dev/null
+++ b/community/uboot-tools/PKGBUILD
@@ -0,0 +1,32 @@
+# Maintainer: Anatol Pomozov
+# Contributor: Michael Lass <bevan@bi-co.net>
+# Contributor: Philipp Schrader <philipp.schrader+arch@gmail.com>
+
+# remove when bumped upstream
+
+pkgname=uboot-tools
+pkgver=2022.01
+pkgrel=1
+pkgdesc='U-Boot bootloader utility tools'
+arch=(x86_64)
+url='https://www.denx.de/wiki/U-Boot/WebHome'
+license=(GPL)
+depends=(openssl)
+source=(ftp://ftp.denx.de/pub/u-boot/u-boot-$pkgver.tar.bz2{,.sig})
+validpgpkeys=('1A3C7F70E08FAB1707809BBF147C39FF9634B72C')
+options=(!lto)
+sha1sums=('3371c1d58966e9000b4680e90cd29caa212969d2'
+          'SKIP')
+
+build() {
+  cd u-boot-$pkgver
+  make defconfig
+  make tools-all KBUILD_HOSTLDFLAGS=${LDFLAGS}
+}
+
+package() {
+  install -m 755 -d "$pkgdir"/usr/bin
+  install -m 755 -t "$pkgdir"/usr/bin/ u-boot-$pkgver/tools/{mk{,env}image,env/fw_printenv,img2srec,dumpimage,netconsole,jtagconsole,ncb}
+  ln -s fw_printenv "$pkgdir"/usr/bin/fw_setenv
+  install -m 644 -D u-boot-$pkgver/doc/mkimage.1 "$pkgdir"/usr/share/man/man1/mkimage.1
+}