2 files changed, 6 insertions, 3 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 066fda016cd3..c2215ef0e6d5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Tue Sep 13 04:52:18 UTC 2016
+# Tue Sep 13 07:29:49 UTC 2016
 pkgbase = zfs-linux
 	pkgdesc = Kernel modules for the Zettabyte File System.
 	pkgver = 0.6.5.8_4.7.2_1
-	pkgrel = 6
+	pkgrel = 7
 	url = http://zfsonlinux.org/
 	install = zfs.install
 	arch = x86_64
@@ -15,6 +15,8 @@ pkgbase = zfs-linux
 	depends = zfs-utils-linux
 	depends = linux=4.7.2
 	provides = zfs
+	conflicts = zfs-linux-git
+	conflicts = zfs-linux-lts
 	replaces = zfs-git
 	source = https://github.com/zfsonlinux/zfs/releases/download/zfs-0.6.5.8/zfs-0.6.5.8.tar.gz
 	sha256sums = d77f43f7dc38381773e2c34531954c52f3de80361b7bb10c933a7482f89cfe84
diff --git a/PKGBUILD b/PKGBUILD
index db247a60e8ba..56b4035ab2a1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -16,7 +16,7 @@
 #
 pkgname="zfs-linux"
 pkgver=0.6.5.8_4.7.2_1
-pkgrel=6
+pkgrel=7
 pkgdesc="Kernel modules for the Zettabyte File System."
 depends=("kmod" "spl-linux" "zfs-utils-linux" "linux=4.7.2")
 makedepends=("linux-headers=4.7.2")
@@ -28,6 +28,7 @@ groups=("archzfs-linux")
 license=("CDDL")
 install=zfs.install
 provides=("zfs")
+conflicts=('zfs-linux-git' 'zfs-linux-lts')
 replaces=("zfs-git")
 
 build() {