diff --git a/alarm/uboot-wandboard/PKGBUILD b/alarm/uboot-wandboard/PKGBUILD
index 8f696c882..3ed43e85f 100644
--- a/alarm/uboot-wandboard/PKGBUILD
+++ b/alarm/uboot-wandboard/PKGBUILD
@@ -5,7 +5,7 @@ buildarch=4
 
 pkgbase=uboot-wandboard
 pkgname=('uboot-wandboard-solo' 'uboot-wandboard-dual' 'uboot-wandboard-quad')
-pkgver=2014.01
+pkgver=2014.04
 pkgrel=1
 arch=('armv7h')
 url="http://git.denx.de/u-boot.git/"
@@ -14,9 +14,9 @@ makedepends=('git')
 source=("ftp://ftp.denx.de/pub/u-boot/u-boot-${pkgver}.tar.bz2"
         "https://raw.github.com/eewiki/u-boot-patches/master/v${pkgver}/0001-wandboard-uEnv.txt-bootz-n-fixes.patch"
         'alarm.patch')
-md5sums=('e531307578f6d32a7ccb1d04f1e08cbc'
+md5sums=('6d2116d1385a66e9a59742caa9d62a54'
          '07b1aba3db09dc86c2c3960baa4d77ad'
-         '8f749cdb50b4deddbfa92655610ad5f4')
+         'c6dbc33cd1be40aa23623ef5aa9aa9f0')
 
 prepare() {
   cd u-boot-${pkgver}
@@ -29,11 +29,12 @@ build() {
   
   unset CFLAGS CXXFLAGS LDFLAGS
   
+  mkdir bins
   for i in solo dl quad; do
     make distclean
     make wandboard_${i}_config
     make
-    mv u-boot.imx u-boot-${i}.imx
+    mv u-boot.imx bins/u-boot-${i}.imx
   done
 }
 
@@ -43,7 +44,7 @@ package_uboot-wandboard-solo() {
   install=${pkgbase}.install
 
   mkdir -p "${pkgdir}"/boot
-  cp u-boot-${pkgver}/u-boot-solo.imx "${pkgdir}"/boot/u-boot.imx
+  cp u-boot-${pkgver}/bins/u-boot-solo.imx "${pkgdir}"/boot/u-boot.imx
 }
 
 package_uboot-wandboard-dual() {
@@ -52,7 +53,7 @@ package_uboot-wandboard-dual() {
   install=${pkgbase}.install
 
   mkdir -p "${pkgdir}"/boot
-  cp u-boot-${pkgver}/u-boot-dl.imx "${pkgdir}"/boot/u-boot.imx
+  cp u-boot-${pkgver}/bins/u-boot-dl.imx "${pkgdir}"/boot/u-boot.imx
 }
 
 package_uboot-wandboard-quad() {
@@ -61,5 +62,5 @@ package_uboot-wandboard-quad() {
   install=${pkgbase}.install
 
   mkdir -p "${pkgdir}"/boot
-  cp u-boot-${pkgver}/u-boot-quad.imx "${pkgdir}"/boot/u-boot.imx
+  cp u-boot-${pkgver}/bins/u-boot-quad.imx "${pkgdir}"/boot/u-boot.imx
 }
diff --git a/alarm/uboot-wandboard/alarm.patch b/alarm/uboot-wandboard/alarm.patch
index f83e351b5..0244ec5ba 100644
--- a/alarm/uboot-wandboard/alarm.patch
+++ b/alarm/uboot-wandboard/alarm.patch
@@ -1,6 +1,6 @@
 diff -urN a/include/configs/wandboard.h b/include/configs/wandboard.h
---- a/include/configs/wandboard.h	2014-03-19 15:09:36.119921706 -0600
-+++ b/include/configs/wandboard.h	2014-03-19 15:25:36.641399875 -0600
+--- a/include/configs/wandboard.h	2014-05-17 13:09:55.544901200 -0600
++++ b/include/configs/wandboard.h	2014-05-17 13:10:26.309787812 -0600
 @@ -108,6 +108,8 @@
  #define CONFIG_DEFAULT_FDT_FILE		"imx6q-wandboard.dtb"
  #endif
@@ -64,19 +64,16 @@ diff -urN a/include/configs/wandboard.h b/include/configs/wandboard.h
  	"netargs=setenv bootargs console=${console},${baudrate} " \
  		"root=/dev/nfs " \
  	"ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp\0" \
-@@ -208,10 +197,14 @@
- 			"echo Running uenvcmd ...;" \
- 			"run uenvcmd;" \
- 		"fi;" \
-+		"echo Running default loaduimage ...;" \
-+		"if run loaduimage; then " \
-+			"run mmcbootm;" \
-+		"fi;" \
+@@ -211,7 +200,11 @@
  		"echo Running default loadzimage ...;" \
  		"if run loadzimage; then " \
  			"run loadfdt;" \
 -			"run mmcboot;" \
 +			"run mmcbootz;" \
++		"fi;" \
++		"echo Running default loaduimage ...;" \
++		"if run loaduimage; then " \
++			"run mmcbootm;" \
  		"fi;" \
  	"fi;"