diff --git a/alarm/xf86-video-armsoc-git/PKGBUILD b/alarm/xf86-video-armsoc-git/PKGBUILD
index fc465f509..c6e5a0b9d 100644
--- a/alarm/xf86-video-armsoc-git/PKGBUILD
+++ b/alarm/xf86-video-armsoc-git/PKGBUILD
@@ -6,36 +6,38 @@
 
 buildarch=4
 
-pkgname="xf86-video-armsoc"
-pkgver=20130319
+pkgname=xf86-video-armsoc-git
+pkgver=145.47a3271
+pkgver() {
+	cd "$srcdir/xf86-video-armsoc"
+	echo $(git rev-list --count makepkg).$(git rev-parse --short makepkg)
+}
+epoch=1
 pkgrel=1
 arch=('armv7h')
 url="http://git.chromium.org/gitweb/?p=chromiumos/third_party/xf86-video-armsoc.git;a=summary"
 license=('GPL2')
 makedepends=('git' 'pkgconfig' 'xorg-server-devel' 'resourceproto' 'scrnsaverproto')
 options=('!libtool')
-source=('compat_post_X_1.13.patch')
-md5sums=('12ccb37f9bdfe2e920d95a2cca832295')  
-_gitroot="http://git.chromium.org/git/chromiumos/third_party/xf86-video-armsoc.git"
+conflicts=(xf86-video-armsoc)
+replaces=(xf86-video-armsoc)
+provides=(xf86-video-armsoc)
+
+source=('compat_post_X_1.13.patch'
+		"git+http://git.chromium.org/git/chromiumos/third_party/xf86-video-armsoc.git#commit=47a3271")
+
+md5sums=('12ccb37f9bdfe2e920d95a2cca832295'
+         'SKIP')
 _gitname="xf86-video-armsoc"
 
-build() {
-  cd "$srcdir"
-  msg "Connecting to git server..."
-
-  if [[ -d "$_gitname" ]]; then
-    cd "$_gitname" && git pull origin
-    msg "The local files are updated."
-  else
-    git clone "$_gitroot" "$_gitname"
-    cd "$_gitname"
-  fi
-  msg "GIT checkout done or server timeout"
-
+prepare() {
+  cd "$srcdir/$_gitname"
   msg "Patching source..."
   # X 1.13 compatibility from the Linaro upstream
   git apply ${srcdir}/compat_post_X_1.13.patch
-	
+}
+build() {
+  cd "$_gitname"
   msg "Starting build..."
   ./autogen.sh --prefix=/usr
   make
@@ -48,3 +50,4 @@ package() {
 
   make DESTDIR="${pkgdir}" install
 }
+
diff --git a/alarm/xf86-video-armsoc/PKGBUILD b/alarm/xf86-video-armsoc/PKGBUILD
deleted file mode 100644
index 57abd1523..000000000
--- a/alarm/xf86-video-armsoc/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# Maintainer: Mike Brown <mbrown@archlinuxarm.org>
-
-# ArmSoc (OMAP + Mali)  FrameBuffer driver for Xorg
-
-buildarch=4
-
-pkgname="xf86-video-armsoc"
-pkgver=20121126
-pkgrel=3
-arch=('armv7h')
-url="http://git.chromium.org/gitweb/?p=chromiumos/third_party/xf86-video-armsoc.git;a=summary"
-license=('GPL2')
-makedepends=('pkgconfig' 'xorg-server-devel' 'resourceproto' 'scrnsaverproto')
-options=('!libtool')
-source=("xf86-video-armsoc.tar.gz")
-
-
-build() {
-  cd "${srcdir}/${pkgname}"
-  ./autogen.sh
-  ./configure --prefix=/usr
-
-  make
-}
-
-package() {
-  pkgdesc="armsoc framebuffer driver for X"
-
-  cd "${srcdir}/${pkgname}"
-
-  make DESTDIR="${pkgdir}" install
-}
-md5sums=('2b20b595c197194ebc29f22fb7246c31')
diff --git a/alarm/xf86-video-armsoc/xf86-video-armsoc.tar.gz b/alarm/xf86-video-armsoc/xf86-video-armsoc.tar.gz
deleted file mode 100644
index 18ed13ed9..000000000
Binary files a/alarm/xf86-video-armsoc/xf86-video-armsoc.tar.gz and /dev/null differ