diff --git a/alarm/xf86-video-armsoc-odroid/PKGBUILD b/alarm/xf86-video-armsoc-odroid/PKGBUILD
index 88f02a46a..4a879aa4c 100644
--- a/alarm/xf86-video-armsoc-odroid/PKGBUILD
+++ b/alarm/xf86-video-armsoc-odroid/PKGBUILD
@@ -14,14 +14,21 @@ makedepends=('git' 'pkgconfig' 'xorg-server-devel' 'resourceproto' 'scrnsaverpro
 options=('!libtool')
 conflicts=(xf86-video-armsoc)
 provides=(xf86-video-armsoc)
-source=("$pkgname::git+https://github.com/mdrjr/xf86-video-armsoc.git#commit=${_commit}")
-md5sums=('SKIP')
+source=("$pkgname::git+https://github.com/mdrjr/xf86-video-armsoc.git#commit=${_commit}"
+        'xorg.patch')
+md5sums=('SKIP'
+         '3e27624156b65b23431c77f38f155620')
 
 pkgver() {
   cd $pkgname
   echo $(git rev-list --count makepkg).$(git rev-parse --short makepkg)
 }
 
+prepare() {
+  cd $pkgname
+  patch -p1 -i ../xorg.patch
+}
+
 build() {
   cd $pkgname
 
@@ -35,4 +42,3 @@ package() {
 
   make DESTDIR="${pkgdir}" install
 }
-
diff --git a/alarm/xf86-video-armsoc-odroid/xorg.patch b/alarm/xf86-video-armsoc-odroid/xorg.patch
new file mode 100644
index 000000000..98c33961a
--- /dev/null
+++ b/alarm/xf86-video-armsoc-odroid/xorg.patch
@@ -0,0 +1,26 @@
+diff -urN a/src/armsoc_driver.c b/src/armsoc_driver.c
+--- a/src/armsoc_driver.c	2014-07-29 20:17:16.708546536 -0600
++++ b/src/armsoc_driver.c	2014-07-29 20:17:48.503440926 -0600
+@@ -1060,7 +1060,7 @@
+ 	/* Initialize backing store: */
+ 	xf86SetBackingStore(pScreen);
+ 
+-	fbdev = xf86GetOptValString(pARMSOC->pOptionInfo,
++	fbdev = (char *)xf86GetOptValString(pARMSOC->pOptionInfo,
+ 			OPTION_INIT_FROM_FBDEV);
+ 	if (fbdev && *fbdev != '\0') {
+ 		if (ARMSOCCopyFB(pScrn, fbdev)) {
+diff -urN a/src/drmmode_display.c b/src/drmmode_display.c
+--- a/src/drmmode_display.c	2014-07-29 20:17:16.708546536 -0600
++++ b/src/drmmode_display.c	2014-07-29 20:17:52.533427544 -0600
+@@ -353,8 +353,8 @@
+ 	drmmode_crtc->last_good_y = crtc->y;
+ 	drmmode_crtc->last_good_rotation = crtc->rotation;
+ 	if (drmmode_crtc->last_good_mode) {
+-		if (drmmode_crtc->last_good_mode->name)
+-			free(drmmode_crtc->last_good_mode->name);
++		//if (drmmode_crtc->last_good_mode->name)
++		//	free(drmmode_crtc->last_good_mode->name);
+ 		free(drmmode_crtc->last_good_mode);
+ 	}
+ 	drmmode_crtc->last_good_mode = xf86DuplicateMode(&crtc->mode);