2 files changed, 3 insertions, 0 deletions

diff --git a/.SRCINFO b/.SRCINFO
index be948a9e6f22..9d5898fdf3a9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -11,6 +11,8 @@ pkgbase = kaffeine-legacy
 	makedepends = automoc4
 	depends = kdebase-runtime
 	depends = xine-lib
+	conflicts = kaffeine
+	conflicts = kaffeine-git
 	source = http://downloads.sourceforge.net/kaffeine-legacy/kaffeine-legacy-1.2.2.tar.gz
 	source = kaffeine-1.2.2-gcc4.7.patch
 	md5sums = 690e48d2e5fe123887109aa9b1bc1c31
diff --git a/PKGBUILD b/PKGBUILD
index 7f075bc705e6..a4e299c69d1d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -11,6 +11,7 @@ arch=('i686' 'x86_64')
 url="http://kaffeine.kde.org"
 depends=('kdebase-runtime' 'xine-lib')
 makedepends=('cmake' 'automoc4')
+conflicts=('kaffeine' 'kaffeine-git')
 install=kaffeine.install
 source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz
         kaffeine-1.2.2-gcc4.7.patch)