diff --git a/alarm/uboot-odroid/0001-arch-linux-arm-modifications.patch b/alarm/uboot-odroid/0001-arch-linux-arm-modifications.patch
index 33f7487f4..42025f110 100644
--- a/alarm/uboot-odroid/0001-arch-linux-arm-modifications.patch
+++ b/alarm/uboot-odroid/0001-arch-linux-arm-modifications.patch
@@ -1,7 +1,7 @@
 From e8374fe12000eaadbf2c486700138e85286bea32 Mon Sep 17 00:00:00 2001
 From: Kevin Mihelich <kevin@archlinuxarm.org>
 Date: Fri, 22 Aug 2014 17:51:41 -0600
-Subject: [PATCH] arch linux arm modifications
+Subject: [PATCH 1/2] arch linux arm modifications
 
 ---
  include/configs/odroid.h | 167 +++++++++++++++++++----------------------------
diff --git a/alarm/uboot-odroid/0002-odroid-x-support.patch b/alarm/uboot-odroid/0002-odroid-x-support.patch
new file mode 100644
index 000000000..d0e729762
--- /dev/null
+++ b/alarm/uboot-odroid/0002-odroid-x-support.patch
@@ -0,0 +1,39 @@
+From e118875e0bbb7d08d424081592660ea6b07ba163 Mon Sep 17 00:00:00 2001
+From: Kevin Mihelich <kevin@archlinuxarm.org>
+Date: Fri, 6 Feb 2015 05:40:56 -0700
+Subject: [PATCH 2/2] odroid-x support
+
+---
+ board/samsung/odroid/odroid.c | 2 +-
+ include/configs/odroid.h      | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/board/samsung/odroid/odroid.c b/board/samsung/odroid/odroid.c
+index b7d2381..f7e793c 100644
+--- a/board/samsung/odroid/odroid.c
++++ b/board/samsung/odroid/odroid.c
+@@ -54,7 +54,7 @@ void set_board_type(void)
+ 
+ const char *get_board_type(void)
+ {
+-	const char *board_type[] = {"u3", "x2"};
++	const char *board_type[] = {"u3", "x"};
+ 
+ 	return board_type[gd->board_type];
+ }
+diff --git a/include/configs/odroid.h b/include/configs/odroid.h
+index 0bc008b..dfd8fd5 100644
+--- a/include/configs/odroid.h
++++ b/include/configs/odroid.h
+@@ -26,7 +26,7 @@
+ 
+ #define CONFIG_MACH_TYPE	4289
+ 
+-#define CONFIG_NR_DRAM_BANKS	8
++#define CONFIG_NR_DRAM_BANKS	4
+ #define CONFIG_SYS_SDRAM_BASE	0x40000000
+ #define SDRAM_BANK_SIZE		(256 << 20)	/* 256 MB */
+ #define PHYS_SDRAM_1		CONFIG_SYS_SDRAM_BASE
+-- 
+2.2.2
+
diff --git a/alarm/uboot-odroid/PKGBUILD b/alarm/uboot-odroid/PKGBUILD
index 8382082ac..ce2b230a0 100644
--- a/alarm/uboot-odroid/PKGBUILD
+++ b/alarm/uboot-odroid/PKGBUILD
@@ -3,12 +3,12 @@
 
 buildarch=4
 
-pkgname=uboot-odroid
+pkgbase=uboot-odroid
+pkgname=('uboot-odroid' 'uboot-odroid-x')
 pkgver=2015.01
-pkgrel=1
-pkgdesc="U-Boot for ODROID-X/X2/U2/U3"
+pkgrel=2
 arch=('armv7h')
-url="https://github.com/hardkernel/u-boot"
+url='http://www.denx.de/wiki/U-Boot/WebHome'
 license=('GPL')
 install=$pkgname.install
 backup=('boot/uEnv.txt')
@@ -20,13 +20,15 @@ source=("ftp://ftp.denx.de/pub/u-boot/u-boot-${pkgver}.tar.bz2"
         "https://github.com/hardkernel/u-boot/raw/${_commit}/sd_fuse/tzsw.HardKernel"
         "sd_fusing.sh"
         '0001-arch-linux-arm-modifications.patch'
+        '0002-odroid-x-support.patch'
         'uEnv.txt')
 md5sums=('7f08dc9e98a71652bd6968888ed6ec95'
          '3ab6d3cc2061bc2590d60320254017c6'
          '841502de02bd42f2898e36c89c260b0f'
          'c38faafa02a6a1ae834457f378c82113'
          '17909ae93a0ae7b4c155234040105035'
-         '2052114e0a93366c700611f8041dc82c'
+         '5f6296fe2c79b2b799fb4420bafbca60'
+         'ff6e82e3c0bf31aff53572e759e30bca'
          'fb5c9ea3108afa298087549f0453b00f')
 
 prepare() {
@@ -42,15 +44,35 @@ build() {
   unset CXXFLAGS
   unset CPPFLAGS
 
+  # build for X2/U2/U3
   make distclean 
   make odroid_config
   make EXTRAVERSION=-${pkgrel}
+  mv u-boot-dtb.bin ../u-boot-dtb.bin
+
+  # patch and build for X
+  git apply ../0002-odroid-x-support.patch
+  make distclean
+  make odroid_config
+  make EXTRAVERSION=-${pkgrel}
 }
 
-package() {
+package_uboot-odroid() {
+  pkgdesc="U-Boot for ODROID-X2/U2/U3"
+
   cd u-boot-${pkgver}
   mkdir -p ${pkgdir}/boot
-  cp u-boot-dtb.bin ${pkgdir}/boot/u-boot.bin
+  cp ../u-boot-dtb.bin ${pkgdir}/boot/u-boot.bin
+  cp ../uEnv.txt ${pkgdir}/boot
+  cp ../{{bl1,bl2,tzsw}.HardKernel,sd_fusing.sh} ${pkgdir}/boot
+}
+
+package_uboot-odroid-x() {
+  pkgdesc="U-Boot for ODROID-X"
+
+  cd u-boot-${pkgver}
+  mkdir -p ${pkgdir}/boot
+  cp u-boot.bin ${pkgdir}/boot/u-boot.bin
   cp ../uEnv.txt ${pkgdir}/boot
   cp ../{{bl1,bl2,tzsw}.HardKernel,sd_fusing.sh} ${pkgdir}/boot
 }