diff --git a/alarm/uboot-pandaboard/PKGBUILD b/alarm/uboot-pandaboard/PKGBUILD
index 9dbf48a25..305b9b60a 100644
--- a/alarm/uboot-pandaboard/PKGBUILD
+++ b/alarm/uboot-pandaboard/PKGBUILD
@@ -4,32 +4,30 @@
 buildarch=4
 
 pkgname=uboot-pandaboard
-pkgver=2013.10
-pkgrel=2
+pkgver=2014.04
+pkgrel=1
 pkgdesc="U-Boot for Pandaboard and Pandaboard ES"
 arch=('armv7h')
 url="http://git.denx.de/u-boot.git/"
 license=('GPL')
-makedepends=('git')
-source=("uboot::git://git.denx.de/u-boot.git#tag=v${pkgver}"
+source=("ftp://ftp.denx.de/pub/u-boot/u-boot-${pkgver}.tar.bz2"
         'http://raw.github.com/eewiki/u-boot-patches/master/v${pkgver}/0001-omap4_common-uEnv.txt-bootz-n-fixes.patch'
         'alarm.patch'
         'uEnv.txt')
-md5sums=('SKIP'
-         '683bf12be7b0be3de60cf2f33e85a011'
-         '148982b955b96dfd16284181523df1a1'
-         'e311fff8d388e9a8f2672cb8c5c819ac')
+md5sums=('6d2116d1385a66e9a59742caa9d62a54'
+         'd796b672643d92f6b43b4ba74e8a244f'
+         '119804f59c0b392c70bcdc67dc220ae0'
+         '76589e692f164699f5d8c7202af1f4fc')
 
 prepare() {
-  cd uboot
+  cd u-boot-${pkgver}
 
-  rm -rf .git
-  patch -p1 -i "${srcdir}"/0001-omap4_common-uEnv.txt-bootz-n-fixes.patch
-  patch -p1 -i "${srcdir}"/alarm.patch
+  patch -Np1 -i "${srcdir}"/0001-omap4_common-uEnv.txt-bootz-n-fixes.patch
+  patch -Np1 -i "${srcdir}"/alarm.patch
 }
 
 build() {
-  cd uboot
+  cd u-boot-${pkgver}
 
   unset LDFLAGS
 
@@ -39,7 +37,8 @@ build() {
 }
 
 package() {
-  cd uboot
+  cd u-boot-${pkgver}
+
   mkdir -p "${pkgdir}"/boot
   cp MLO u-boot.img "${srcdir}"/uEnv.txt "${pkgdir}"/boot
 }
diff --git a/alarm/uboot-pandaboard/alarm.patch b/alarm/uboot-pandaboard/alarm.patch
index 458ffb18d..2c79703eb 100644
--- a/alarm/uboot-pandaboard/alarm.patch
+++ b/alarm/uboot-pandaboard/alarm.patch
@@ -1,25 +1,29 @@
-diff -urN a/include/configs/omap4_common.h b/include/configs/omap4_common.h
---- a/include/configs/omap4_common.h	2014-01-07 18:45:04.689541145 -0700
-+++ b/include/configs/omap4_common.h	2014-01-07 18:58:41.060695680 -0700
-@@ -136,6 +136,8 @@
- 
- #define CONFIG_ENV_OVERWRITE
+diff -urN a/include/configs/ti_omap4_common.h b/include/configs/ti_omap4_common.h
+--- a/include/configs/ti_omap4_common.h	2014-05-17 13:32:47.384861195 -0600
++++ b/include/configs/ti_omap4_common.h	2014-05-17 13:48:19.361560495 -0600
+@@ -85,6 +85,8 @@
+ #undef CONFIG_CMD_NET
+ #undef CONFIG_CMD_NFS
  
 +#define CONFIG_IDENT_STRING " Arch Linux ARM"
 +
- #define CONFIG_EXTRA_ENV_SETTINGS \
- 	"loadaddr=0x82000000\0" \
- 	"console=ttyO2,115200n8\0" \
-@@ -144,7 +146,7 @@
+ /*
+  * Environment setup
+  */
+@@ -95,9 +97,9 @@
+ 	"fdtaddr=0x815f0000\0" \
  	"fdtfile=undefined\0" \
- 	"bootpart=0:2\0" \
- 	"bootdir=/boot\0" \
+ 	"bootpart=0:1\0" \
+-	"bootdir=\0" \
 -	"fdtdir=/dtbs\0" \
+-	"bootfile=zImage\0" \
++	"rootpart=0:2\0" \
++	"bootdir=/boot\0" \
 +	"fdtdir=/boot/dtbs\0" \
- 	"bootfile=zImage\0" \
  	"usbtty=cdc_acm\0" \
  	"vram=16M\0" \
-@@ -153,14 +155,12 @@
+ 	"defaultdisplay=dvi\0" \
+@@ -105,24 +107,26 @@
  	"buddy=none\0" \
  	"mmcdev=0\0" \
  	"mmcpart=1\0" \
@@ -33,42 +37,46 @@ diff -urN a/include/configs/omap4_common.h b/include/configs/omap4_common.h
 -		"root=${mmcroot} " \
 -		"rootfstype=${mmcrootfstype}\0" \
 +		"root=${mmcroot}\0" \
- 	"loadbootscript=load mmc ${mmcdev}:${mmcpart} ${loadaddr} boot.scr\0" \
+ 	"loadbootscript=load mmc ${bootpart} ${loadaddr} boot.scr\0" \
  	"bootscript=echo Running bootscript from mmc${mmcdev} ...; " \
  		"source ${loadaddr}\0" \
-@@ -168,13 +168,13 @@
- 	"importbootenv=echo Importing environment from mmc (uEnv.txt)...; " \
+ 	"loadbootenv=load mmc ${bootpart} ${loadaddr} uEnv.txt\0" \
+ 	"importbootenv=echo Importing environment from mmc${mmcdev} ...; " \
  		"env import -t ${loadaddr} ${filesize}\0" \
- 	"loadimage=load mmc ${bootpart} ${loadaddr} ${bootdir}/${bootfile}\0" \
--	"loadzimage=load mmc ${mmcdev}:${mmcpart} ${loadaddr} zImage\0" \
-+	"loaduimage=load mmc ${bootpart} ${loadaddr} ${bootdir}/uImage\0" \
- 	"mmcboot=echo Booting from mmc${mmcdev} ...; " \
+-	"loadimage=load mmc ${bootpart} ${loadaddr} ${bootdir}/${bootfile}\0" \
+-	"mmcboot=echo Booting from mmc${mmcdev} ...; " \
++	"loadzimage=load mmc ${rootpart} ${loadaddr} ${bootdir}/zImage\0" \
++	"loaduimage=load mmc ${rootpart} ${loadaddr} ${bootdir}/uImage\0" \
++	"mmcbootz=echo Booting from mmc${mmcdev} ...; " \
  		"run mmcargs; " \
  		"bootz ${loadaddr} - ${fdtaddr}\0" \
++	"mmcbootm=echo Booting from mmc${mmcdev} ...; " \
++		"run mmcargs; " \
++		"bootm ${loadaddr}\0" \
  	"mmc_classic_boot=echo Booting from mmc${mmcdev} ...; " \
  		"run mmcargs; " \
--		"bootz ${loadaddr}\0" \
-+		"bootm ${loadaddr}\0" \
- 	"findfdt="\
- 		"if test $board_name = sdp4430; then " \
- 			"setenv fdtfile omap4-sdp.dtb; fi; " \
-@@ -186,7 +186,7 @@
+ 		"bootz ${loadaddr}\0" \
+@@ -137,7 +141,7 @@
  			"setenv fdtfile omap4-panda-es.dtb; fi;" \
  		"if test $fdtfile = undefined; then " \
  			"echo WARNING: Could not determine device tree to use; fi; \0" \
--	"loadfdt=load mmc ${mmcdev}:${mmcpart} ${fdtaddr} ${fdtdir}/${fdtfile}\0" \
-+	"loadfdt=load mmc ${bootpart} ${fdtaddr} ${fdtdir}/${fdtfile}\0" \
+-	"loadfdt=load mmc ${bootpart} ${fdtaddr} ${fdtdir}/${fdtfile}\0" \
++	"loadfdt=load mmc ${rootpart} ${fdtaddr} ${fdtdir}/${fdtfile}\0" \
  
  #define CONFIG_BOOTCOMMAND \
  	"run findfdt; " \
-@@ -203,8 +203,8 @@
- 				"echo Running uenvcmd ...;" \
+@@ -155,9 +159,12 @@
  				"run uenvcmd;" \
  			"fi;" \
--			"echo Running default loadzimage ...;" \
--			"if run loadzimage; then " \
-+			"echo Running default loaduimage ...;" \
-+			"if run loaduimage; then " \
- 				"run mmc_classic_boot; " \
- 			"fi; " \
  		"fi;" \
+-		"if run loadimage; then " \
++		"if run loadzimage; then " \
+ 			"run loadfdt;" \
+-			"run mmcboot; " \
++			"run mmcbootz; " \
++		"fi; " \
++		"if run loaduimage; then " \
++			"run mmcbootm; " \
+ 		"fi; " \
+ 	"fi"
+