diff --git a/.SRCINFO b/.SRCINFO
index 1f77fda..db1e539 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,6 @@
-# Generated by mksrcinfo v8
-# Wed Jan 11 23:35:43 UTC 2017
 pkgbase = desmume-git
 	pkgdesc = Nintendo DS emulator
-	pkgver = 0.9.11.r583.07a68db
+	pkgver = 0.9.11.r800.e29e825d
 	pkgrel = 2
 	url = http://desmume.org/
 	arch = i686
@@ -15,11 +13,11 @@ pkgbase = desmume-git
 	makedepends = lua
 	depends = gtkglext
 	depends = libglade
+	depends = lua51
 	depends = libgl
 	depends = openal
 	depends = sdl
 	depends = soundtouch
-	depends = lua51
 	provides = desmume
 	conflicts = desmume
 	conflicts = desmume-sourceforge
diff --git a/PKGBUILD b/PKGBUILD
index 80ca558..c63e6a4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,80 +1,64 @@
-#! /bin/bash
-# Maintainer: Markus Kitsinger (SwooshyCueb) <root@swooshalicio.us>
-
 _pkgname=desmume
 pkgname=${_pkgname}-git
 pkgdesc='Nintendo DS emulator'
 url='http://desmume.org/'
 arch=('i686' 'x86_64')
 license=('GPL')
-
-# The developers do not seem to make consistent use of tags
-# I've manually specified the commit where the branch of the latest release (as
-# of this writing) split from master, and we use this to get the rev number.
-_last_rtm_ver=0.9.11
-_last_rtm_commit=ccbf85ed42e4350af415d56b1465e83614c85ef8
-pkgver="${_last_rtm_ver}.r583.07a68db"
+pkgver=0.9.11.r800.e29e825d
 pkgrel=2
-
 depends=('gtkglext'
          'libglade'
+         'lua51'
          'libgl'
          'openal'
          'sdl'
-         'soundtouch'
-         'lua51')
+         'soundtouch')
 makedepends=('autoconf'
              'automake'
              'pkg-config'
              'git'
              'lua')
-
 provides=('desmume')
 replaces=('desmume-sourceforge'
           'desmume-svn'
           'desmume-jit-svn')
 conflicts=("${provides[@]}" "${replaces[@]}")
-
 source=('git+https://github.com/TASVideos/desmume.git')
 sha512sums=('SKIP')
-
 _builddir="${_pkgname}/src/frontend/posix"
 
 pkgver() {
-  cd "${srcdir}/${_pkgname}"
-
-  local revnum="$(git rev-list --count ${_last_rtm_commit}..HEAD)"
-  local shorthash="$(git rev-parse --short HEAD)"
-
-  printf "%s.r%s.%s" "${_last_rtm_ver}" "${revnum}" "${shorthash}"
+	cd "${srcdir}/${_pkgname}"
+	git describe --long | sed 's/v//;s/-/./g'
 }
 
 prepare(){
-  cd "${srcdir}/${_pkgname}/${_builddir}"
-
-  # lua5.1 package is named lua51 on Arch
-  # we could probably just make it compile against the current lua
-  sed -i 's/lua5.1/lua51/' configure.ac
+	cd "${srcdir}/${_pkgname}/${_builddir}"
+	
+	# lua5.1 package is named lua51 on Arch
+	# we could probably just make it compile against the current lua
+	sed -i 's/lua5.1/lua51/' configure.ac
 }
 
 build() {
-  cd "${srcdir}/${_pkgname}/${_builddir}"
+	cd "${srcdir}/${_pkgname}/${_builddir}"
 
-  ./autogen.sh
+	./autogen.sh
 
-  # Hud causes segfault in gtk version. Wifi doesn't really work.
-  ./configure \
-    --prefix=/usr \
-    --enable-osmesa \
-    --enable-glx \
-    --enable-openal \
-    --enable-glade
+	# Hud causes segfault in gtk version. Wifi doesn't really work.
+	./configure \
+		--prefix=/usr \
+		--enable-osmesa \
+		--enable-glx \
+		--enable-hud \
+		--enable-openal \
+		--enable-glade
 
-  make
+	make
 }
 
 package() {
-  cd "${srcdir}/${_pkgname}/${_builddir}"
+	cd "${srcdir}/${_pkgname}/${_builddir}"
 
-  make DESTDIR="${pkgdir}" install
+	make DESTDIR="${pkgdir}" install
 }