2 files changed, 6 insertions, 2 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e30b4299b70f..43c50f3c6846 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -7,8 +7,12 @@ pkgbase = godot-bin
 	arch = x86_64
 	license = GPL
 	provides = godot-bin
+	conflicts = godot-nightly-bin
 	conflicts = godot
+	conflicts = godot-git
+	replaces = godot-nightly-bin
 	replaces = godot
+	replaces = godot-git
 	source = godot.desktop
 	source = icons.tar.gz
 	md5sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 64273fc2433b..62e4f61501c3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,8 +7,8 @@ arch=("i686" "x86_64")
 url="http://www.godotengine.org"
 license=('GPL')
 provides=("godot-bin")
-conflicts=("godot")
-replaces=("godot")
+conflicts=("godot" "godot-git")
+replaces=("godot" "godot-git")
 source=("godot.desktop" "icons.tar.gz")
 source_i686+=("http://www.godotengine.org:81/godot_x11-"$pkgver"stable.32")
 source_x86_64+=("http://www.godotengine.org:81/godot_x11-"$pkgver"stable.64")