diff --git a/pkgbuild/cairo-compmgr-git/PKGBUILD b/pkgbuild/cairo-compmgr-git/PKGBUILD
index f87e020..badd1fc 100644
--- a/pkgbuild/cairo-compmgr-git/PKGBUILD
+++ b/pkgbuild/cairo-compmgr-git/PKGBUILD
@@ -3,7 +3,8 @@
 # Contributor: Jacob Winther <jacob.winther@gmail.com>
 
 pkgname=cairo-compmgr-git
-pkgver=20130120
+epoch=1
+pkgver=0.3.1.32.gfb4117d
 pkgrel=1
 pkgdesc="Cairo based composite manager - Git version"
 arch=(i686 x86_64)
@@ -16,24 +17,16 @@ depends=("gtk2>=2.16.0" "vala>=0.18" libsm libgl)
 options=(!makeflags
          !libtool)
 
-_gitroot="https://github.com/gandalfn/Cairo-Composite-Manager.git"
-_gitname="cairocompmgr"
+source=('cairocompmgr::git+https://github.com/gandalfn/Cairo-Composite-Manager.git')
+md5sums=('SKIP')
+
+pkgver() {
+  cd "$srcdir"/cairocompmgr
+  git describe --tags | sed 's|-|.|g'
+}
 
 build() {
-  cd "$srcdir"
-
-  msg "Connecting to GIT server..."
-  if [[ -d $_gitname ]]; then
-    (cd $_gitname && git pull )
-  else
-    git clone $_gitroot $_gitname
-  fi
-  msg "GIT checkout done or server timeout"
-  msg "Starting make..."
-
-  rm -rf $_gitname-build
-  cp -r $_gitname $_gitname-build
-  cd $_gitname-build
+  cd "$srcdir"/cairocompmgr
 
   #patch for compatibility with vala 0.20 (git)
   #sed -i 's!libvala-0.18!libvala-0.20!' configure.ac
@@ -45,7 +38,7 @@ build() {
 }
 
 package() {
-  cd $_gitname-build
+  cd "$srcdir"/cairocompmgr
 
   make DESTDIR="$pkgdir" install
   install -d "$pkgdir/usr/share/gconf/schemas/"
@@ -53,3 +46,5 @@ package() {
   rm -rf "$pkgdir/etc/gconf/schemas/"
 
 }
+
+# vim:set ts=2 sw=2 et: