diff --git a/alarm/uboot-tools/PKGBUILD b/alarm/uboot-tools/PKGBUILD
new file mode 100644
index 000000000..01fdd8c37
--- /dev/null
+++ b/alarm/uboot-tools/PKGBUILD
@@ -0,0 +1,38 @@
+# Maintainer: Kevin Mihelich <kevin@archlinuxarm.org>
+# Contributor: Jonny Gerold <jonny@fsk141.com>
+# Contributor: Julian Langschaedel <meta.rb@gmail.com>
+
+pkgname=uboot-tools
+pkgver=2014.04
+pkgrel=1
+pkgdesc="U-Boot Tools"
+arch=('arm' 'armv6h' 'armv7h')
+license=('GPL' 'LGPL')
+provides=('uboot-env' 'uboot-mkimage')
+replaces=('uboot-env' 'uboot-mkimage')
+backup=(etc/fw_env.config)
+install=uboot-tools.install
+source=(ftp://ftp.denx.de/pub/u-boot/u-boot-$pkgver.tar.bz2
+	fw_env.config)
+md5sums=('6d2116d1385a66e9a59742caa9d62a54'
+         '159f285467e910ba98696b92a311498e')
+
+build() {
+  cd u-boot-${pkgver}
+
+  touch include/config.{h,mk} include/autoconf.mk{.dep,}
+
+  make tools-only
+  make SUBDIRS=tools env
+  make -C tools kwboot
+}
+
+package() {
+  cd u-boot-${pkgver}
+
+  install -dm755 ${pkgdir}/{usr/{bin,share/man/man1},etc}
+  install -m755 tools/{dumpimage,mkimage,mkenvimage,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
new file mode 100644
index 000000000..de5011d9a
--- /dev/null
+++ b/alarm/uboot-tools/fw_env.config
@@ -0,0 +1,14 @@
+# 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