diff --git a/.SRCINFO b/.SRCINFO
index 3c749ef..d0693cb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,14 @@
-# Generated by mksrcinfo v8
-# Tue Feb  2 03:02:50 UTC 2016
 pkgbase = gmqcc-git
 	pkgdesc = An Improved Quake C Compiler
 	pkgver = r1.3714a50
 	pkgrel = 1
-	url = https://github.com/graphitemaster/gmqcc.git
+	url = https://github.com/graphitemaster/gmqcc
 	arch = i686
 	arch = x86_64
-	arch = armv6h
-	arch = armv7h
 	license = MIT
-	makedepends = git
-	depends = glibc
-	provides = gmqcc=0.2.4
-	conflicts = gmqcc
+	makedepends = cmake
+	source = git+https://github.com/graphitemaster/gmqcc.git
+	sha256sums = SKIP
 
 pkgname = gmqcc-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 08850bd..6e0d374 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,71 +1,36 @@
 # Maintainer: M Novick <mnovick1988@gmail.com>
+# Contributor: Alison Watson <marrub@greyserv.net>
 # Contributor: matthiaskrgr <matthiaskrgr _strange_curverd_character_ freedroid D0T org>
-#
-# NOTE: Copied from AUR3 and updated.
-#
-
 
 pkgname=gmqcc-git
-pkgver=r1.3714a50
+pkgver=0.3.5.331.g451873a
 pkgrel=1
 pkgdesc="An Improved Quake C Compiler"
-arch=('i686' 'x86_64' 'armv6h' 'armv7h')
-depends=('glibc')
-conflicts=('gmqcc')
-provides=('gmqcc=0.2.4')
-makedepends=('git')
-url="https://github.com/graphitemaster/gmqcc.git"
+arch=('i686' 'x86_64')
+makedepends=('cmake')
+url="https://github.com/graphitemaster/gmqcc"
 license=('MIT')
-
-_gitroot="git://github.com/graphitemaster/gmqcc.git"
-_gitname="gmqcc"
+source=("git+https://github.com/graphitemaster/gmqcc.git")
+sha256sums=('SKIP')
 
 pkgver() {
-  cd "$srcdir"/"$_gitname"
-  printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+	cd gmqcc
+	git describe --tags | sed 's+-+.+g' | sed 's+^v++'
+}
+
+prepare() {
+	mkdir -p build
 }
 
 build() {
-	cd $srcdir
-	msg "Connecting to the GIT server..."
-	if [[ -d $srcdir/$_gitname ]] ; then
-		cd $_gitname
-		msg "Removing build files..."
-		git clean -dfx
-		msg "Updating..."
-		git pull --no-tags
-		msg "The local files are updated."
-	else
-		msg "Cloning..."
-		git clone $_gitroot $_gitname --depth 1
-		msg "Clone done."
-	fi
-
-	msg "Starting compilation..."
-	cd "$srcdir"/"$_gitname"
-        
-        msg "Configuring..."
-        cmake .
-        
-	msg "Compiling..."
+	cd build
+	cmake ../gmqcc
 	make
 }
 
-#check() {
-#	cd "$srcdir"/"$_gitname"
-#	make test
-#}
-
 package() {
-	cd "$srcdir"/"$_gitname"
-	msg "Building Pkg."
-	#make install DESTDIR=$pkgdir PREFIX=/usr
-	#msg "Compiling done."
-	mkdir -p ${pkgdir}/usr/lib
-        mkdir -p ${pkgdir}/usr/bin
-        install -D "$srcdir"/"$_gitname"/gmqcc ${pkgdir}/usr/bin/gmqcc
-        install -D "$srcdir"/"$_gitname"/testsuite ${pkgdir}/usr/bin/testsuite
-        install -D "$srcdir"/"$_gitname"/qcvm ${pkgdir}/usr/bin/qcvm
-        install -D "$srcdir"/"$_gitname"/libgmqcclib.a ${pkgdir}/usr/lib/libgmqcclib.a
-	install -D LICENSE ${pkgdir}/usr/share/licenses/gmqcc/LICENSE
+	cd build
+	install -Dm755 "gmqcc" "${pkgdir}/usr/bin/gmqcc"
+	install -Dm755 "qcvm" "${pkgdir}/usr/bin/qcvm"
+	install -Dm644 "libgmqcclib.a" "${pkgdir}/usr/lib/libgmqcclib.a"
 }