diff --git a/.SRCINFO b/.SRCINFO
index 9fa7bbb..77c7f49 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,12 +1,13 @@
 pkgbase = libcrossguid-git
 	pkgdesc = Lightweight cross platform C++ GUID/UUID library
-	pkgver = r35.8f399e8
+	pkgver = 0.2.1.r1.g71c709e
 	pkgrel = 1
 	url = https://github.com/graeme-hill/crossguid
 	arch = i686
 	arch = x86_64
 	license = MIT
 	makedepends = git
+	makedepends = cmake
 	provides = libcrossguid
 	conflicts = libcrossguid
 	source = libcrossguid::git+https://github.com/graeme-hill/crossguid.git
diff --git a/PKGBUILD b/PKGBUILD
index af72eb4..8df472f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,13 +1,13 @@
 # Maintainer: Cedric Girard <girard.cedric@gmail.com>
 
 pkgname=libcrossguid-git
-pkgver=r35.8f399e8
+pkgver=0.2.1.r1.g71c709e
 pkgrel=1
 pkgdesc="Lightweight cross platform C++ GUID/UUID library"
 arch=('i686' 'x86_64')
 url="https://github.com/graeme-hill/crossguid"
 license=('MIT')
-makedepends=('git')
+makedepends=('git' 'cmake')
 provides=('libcrossguid')
 conflicts=('libcrossguid')
 source=('libcrossguid::git+https://github.com/graeme-hill/crossguid.git')
@@ -15,31 +15,25 @@ md5sums=('SKIP')
 
 pkgver() {
   cd "$srcdir"/libcrossguid
-  printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+  git describe --long --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
 build() {
   cd "$srcdir"/libcrossguid
-
-  g++ -c guid.cpp -o guid.o $CXXFLAGS -std=c++11 -DGUID_LIBUUID
-  ar rvs libcrossguid.a guid.o
-
-  g++ -c test.cpp -o test.o $CXXFLAGS  -std=c++11
-  g++ -c testmain.cpp -o testmain.o $CXXFLAGS
-  g++ test.o guid.o testmain.o -o test $CXXFLAGS -luuid
-  chmod +x test
+  cmake .
+  make
 
 }
 
 check(){
   cd "$srcdir"/libcrossguid
-  ./test
+  ./xgtest
 }
 
 package() {
   cd "$srcdir"/libcrossguid
-  install -D -m644 libcrossguid.a "${pkgdir}/usr/lib/libcrossguid.a"
-  install -D -m644 guid.h "${pkgdir}/usr/include/guid.h"
+  install -D -m644 libxg.a "${pkgdir}/usr/lib/libxg.a"
+  install -D -m644 Guid.hpp "${pkgdir}/usr/include/Guid.hpp"
   install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }