diff --git a/.SRCINFO b/.SRCINFO
index d81a8fb..ce008e8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,17 @@
+# Generated by mksrcinfo v8
+# Sat Feb  6 19:10:00 UTC 2016
 pkgbase = polkit-explorer
 	pkgdesc = Present PolicyKit information in a human-readable form.
-	pkgver = 1
-	pkgrel = 7
-	url = https://github.com/scarygliders/Polkit-Explorer
+	pkgver = 6.e27209d
+	pkgrel = 1
+	url = https://github.com/scarygliders/polkit-explorer
 	arch = any
 	license = ISC
 	depends = python2-pyqt4
 	depends = python2-lxml
-	source = https://github.com/scarygliders/Polkit-Explorer/archive/master.zip
+	source = git://github.com/scarygliders/polkit-explorer.git
 	source = polkit-explorer.desktop
-	sha256sums = bc90ca03ee4d216bfb5e415d625c1449af5c87898f98305b48b10adf730c75d6
+	sha256sums = SKIP
 	sha256sums = 4343e7c3c9e0dc03bfae8521ab4197661c6ddf4caf150ba4cf3369dc9550518a
 
 pkgname = polkit-explorer
diff --git a/PKGBUILD b/PKGBUILD
index a582767..3c32700 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,32 +1,36 @@
-# Maintainer: Alad Wenter <https://wiki.archlinux.org/index.php/Special:EmailUser/Alad>
+# Maintainer: Manuel Hüsers <manuel.huesers@uni-ol.de>
+# Contributor: Alad Wenter <https://wiki.archlinux.org/index.php/Special:EmailUser/Alad>
 
 pkgname=polkit-explorer
-pkgver=1
-pkgrel=7
-
-pkgdesc="Present PolicyKit information in a human-readable form."
-url="https://github.com/scarygliders/Polkit-Explorer"
-license=('ISC')
+pkgver=6.e27209d
+pkgrel=1
+pkgdesc='Present PolicyKit information in a human-readable form.'
 arch=('any')
-
+url="https://github.com/scarygliders/${pkgname}"
+license=('ISC')
 depends=('python2-pyqt4' 'python2-lxml')
-source=("https://github.com/scarygliders/Polkit-Explorer/archive/master.zip"
-	'polkit-explorer.desktop')
-sha256sums=('bc90ca03ee4d216bfb5e415d625c1449af5c87898f98305b48b10adf730c75d6'
+source=("git://github.com/scarygliders/${pkgname}.git"
+        "${pkgname}.desktop")
+sha256sums=('SKIP'
             '4343e7c3c9e0dc03bfae8521ab4197661c6ddf4caf150ba4cf3369dc9550518a')
 
-package() {
-  cd Polkit-Explorer-master
-  local pydir=usr/lib/python2.7/site-packages/polkitex
-
-  install -d -m755 "$pkgdir"/{usr/bin,$pydir}
-  install -m644 Ui_*.py "$pkgdir"/$pydir/
-  
-  sed -i 's/python$/python2/' polkitex.py
-  install -m755 polkitex.py "$pkgdir"/$pydir/
-  ln -s /$pydir/polkitex.py "$pkgdir"/usr/bin/polkitex
-  
-  install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/polkit-explorer/LICENSE
-  install -Dm644 "$srcdir"/polkit-explorer.desktop \
-	  "$pkgdir"/usr/share/applications/polkit-explorer.desktop
+pkgver() {
+	cd "${srcdir}/${pkgname}"
+	printf '%s.%s' "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+}
+
+package() {
+	cd "${srcdir}/${pkgname}"
+	local pydir='usr/lib/python2.7/site-packages/polkitex'
+
+	install -d -m755 "${pkgdir}"/{usr/bin,$pydir}
+	install -m644 Ui_*.py "${pkgdir}/${pydir}/"
+
+	sed -i 's/python$/python2/' 'polkitex.py'
+	install -m755 'polkitex.py' "${pkgdir}/${pydir}/"
+	ln -s "/${pydir}/polkitex.py" "${pkgdir}/usr/bin/polkitex"
+  
+	install -Dm644 'LICENSE' "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+	install -Dm644 "${srcdir}/${pkgname}.desktop" \
+		"${pkgdir}/usr/share/applications/${pkgname}.desktop"
 }