diff --git a/PKGBUILD b/PKGBUILD
index 82a35b847eb9c817391eb7cca6bd75eeb8f6f72b..bbef879dcf64f6d3ddf49e2792fb079b3a413f83 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,14 +10,15 @@ pkgname=('manjaro-tools-base-git'
         'manjaro-tools-pkg-git'
         'manjaro-tools-iso-git'
         'manjaro-tools-yaml-git')
-pkgver=r2674.3e80462
+pkgver=r2687.7d56c7a
 pkgrel=1
 arch=('x86_64' 'i686')
 pkgdesc='Development tools for Manjaro Linux'
 license=('GPL')
-groups=('manjaro-tools')
+groups=("$pkgbase")
 url='https://gitlab.manjaro.org/tools/development-tools/manjaro-tools'
 makedepends=('git' 'docbook2x')
+conflicts=("$_pkgbase-base" "$_pkgbase-pkg" "$_pkgbase-iso" "$_pkgbase-yaml")
 source=("manjaro-tools::git+$url.git#branch=$_branch")
 sha256sums=('SKIP')