2 files changed, 4 insertions, 2 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 7361e7a46545..1b84690a536f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = awesome-git
 	pkgdesc = Highly configurable framework window manager
-	pkgver = 3.5.2.315.gc9f08fb
+	pkgver = 3.5.2.344.g2f0a7f9
 	pkgrel = 1
 	url = http://awesome.naquadah.org/
 	arch = i686
@@ -31,6 +31,7 @@ pkgbase = awesome-git
 	optdepends = vicious: widgets for the Awesome window manager
 	provides = notification-daemon
 	provides = awesome
+	conflicts = awesome
 	backup = etc/xdg/awesome/rc.lua
 	source = awesome-git::git://github.com/awesomeWM/awesome.git
 	md5sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index f2f57d392ccd..2851c02f5cfb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,7 +10,7 @@
 
 _pkgname=awesome
 pkgname=${_pkgname}-git
-pkgver=3.5.2.315.gc9f08fb
+pkgver=3.5.2.344.g2f0a7f9
 pkgrel=1
 pkgdesc='Highly configurable framework window manager'
 arch=('i686' 'x86_64')
@@ -24,6 +24,7 @@ optdepends=('rlwrap: readline support for awesome-client'
             'dex: autostart your desktop files'
             'vicious: widgets for the Awesome window manager')
 provides=('notification-daemon' 'awesome')
+conflicts=('awesome')
 backup=('etc/xdg/awesome/rc.lua')
 source=("$pkgname::git://github.com/awesomeWM/awesome.git")
 md5sums=('SKIP')