diff --git a/aur/samen-git/PKGBUILD b/aur/samen-git/PKGBUILD
index 38e205f13..287cfd1d4 100644
--- a/aur/samen-git/PKGBUILD
+++ b/aur/samen-git/PKGBUILD
@@ -1,43 +1,37 @@
 # Maintainer: Kai Uwe Jesussek <kajot@gmx.net>
 
 plugrel=1
+_gitname="Samen"
 pkgname=samen-git
-pkgver=20110616
+pkgver=6.1e5081b
+pkgver(){
+	cd $srcdir/$_gitname
+	echo $(git rev-list --count master).$(git rev-parse --short master)
+}
+epoch=1
 pkgrel=1
-pkgdesc="samen is a ultra small wpa_supplicant (wpa_cli) action handler."
+pkgdesc="An ultra small wpa_supplicant (wpa_cli) action handler."
 url="https://github.com/kimperator/Samen/wiki"
 arch=('arm' 'i686' 'x86_64')
 license=('GPL')
 provides=('samen')
 makedepends=('git' 'cmake')
 depends=('wpa_supplicant')
-_gitroot=("git://github.com/kimperator/Samen.git")
-_gitname=("Samen")
+source=("git://github.com/kimperator/Samen.git")
 
+prepare(){
+	if [[ ! -d $srcdir/build ]]; then
+		mkdir build
+	fi
+}
 build() {
-  cd ${srcdir}
-
- ## Git checkout
-  if [ -d ${srcdir}/${_gitname} ] ; then
-    msg "Git checkout:  Updating existing tree"
-    cd ${_gitname} && git pull origin
-    msg "Git checkout:  Tree has been updated"
-  else
-    msg "Git checkout:  Retrieving sources"
-    git clone --depth 1 ${_gitroot}
-  fi
-  msg "Checkout completed"
-
- ## Build
-  rm -rf ${srcdir}/${_gitname}-build
-  cp -r ${srcdir}/${_gitname} ${srcdir}/${_gitname}-build
-  cd ${srcdir}/${_gitname}-build
-  mkdir build
   cd build
-  cmake ..
+  cmake $srcdir/$_gitname
+  make
+}
+package(){
+  cd build
   make DESTDIR=${pkgdir} install
-  cp -r ../additions/arch/etc ${pkgdir}
-}
-package() {
-  true
+  cp -dpr --no-preserve=ownership $srcdir/$_gitname/additions/arch/etc ${pkgdir}
 }
+md5sums=('SKIP')