2 files changed, 2 insertions, 0 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ddc1da930d85..03c3d7985772 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -16,6 +16,7 @@ pkgbase = bitfighter
 	depends = libvorbis
 	depends = libmodplug
 	depends = speex
+	conflicts = bitfighterd
 	source = http://bitfighter.org/files/bitfighter-021.tar.gz
 	source = http://bitfighter.org/files/classic_level_pack.zip
 	source = bitfighter.png
diff --git a/PKGBUILD b/PKGBUILD
index 9e1ed8c1bdd4..7bb4c7f1a337 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -13,6 +13,7 @@ pkgdesc="A fast-paced team-based outer-space multi-player combat game"
 arch=('i686' 'x86_64')
 url="http://bitfighter.org/"
 license=('GPL')
+conflicts=('bitfighterd')
 depends=(
     'sqlite'
 	'sdl2'