diff --git a/.SRCINFO b/.SRCINFO
index d61a2c0..5b27f43 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = zfs-dkms
 	pkgdesc = Kernel modules for the Zettabyte File System.
 	pkgver = 0.7.11
-	pkgrel = 1
+	pkgrel = 2
 	url = http://zfsonlinux.org/
 	arch = x86_64
 	groups = archzfs-dkms
@@ -11,31 +11,9 @@ pkgbase = zfs-dkms
 	depends = lsb-release
 	depends = dkms
 	provides = zfs
-	conflicts = zfs-dkms-git
-	conflicts = zfs-archiso-linux
-	conflicts = zfs-archiso-linux-git
-	conflicts = zfs-linux-hardened
-	conflicts = zfs-linux-hardened-git
-	conflicts = zfs-linux-lts
-	conflicts = zfs-linux-lts-git
-	conflicts = zfs-linux
-	conflicts = zfs-linux-git
-	conflicts = zfs-linux-vfio
-	conflicts = zfs-linux-vfio-git
-	conflicts = zfs-linux-zen
-	conflicts = zfs-linux-zen-git
-	conflicts = zfs-archiso-linux-headers
-	conflicts = zfs-archiso-linux-git-headers
-	conflicts = zfs-linux-hardened-headers
-	conflicts = zfs-linux-hardened-git-headers
-	conflicts = zfs-linux-lts-headers
-	conflicts = zfs-linux-lts-git-headers
-	conflicts = zfs-linux-headers
-	conflicts = zfs-linux-git-headers
-	conflicts = zfs-linux-vfio-headers
-	conflicts = zfs-linux-vfio-git-headers
-	conflicts = zfs-linux-zen-headers
-	conflicts = zfs-linux-zen-git-headers
+	provides = zfs-headers
+	conflicts = zfs
+	conflicts = zfs-headers
 	source = https://github.com/zfsonlinux/zfs/releases/download/zfs-0.7.11/zfs-0.7.11.tar.gz
 	sha256sums = 4dff9ecce6e02061242d9435febe88c1250de83b96d392b712bccf31c459517a
 
diff --git a/PKGBUILD b/PKGBUILD
index 7fd3f0d..9198258 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,7 +9,7 @@ pkgname="zfs-dkms"
 pkgdesc="Kernel modules for the Zettabyte File System."
 
 pkgver=0.7.11
-pkgrel=1
+pkgrel=2
 makedepends=()
 arch=("x86_64")
 url="http://zfsonlinux.org/"
@@ -17,9 +17,9 @@ source=("https://github.com/zfsonlinux/zfs/releases/download/zfs-${pkgver}/zfs-$
 sha256sums=("4dff9ecce6e02061242d9435febe88c1250de83b96d392b712bccf31c459517a")
 license=("CDDL")
 depends=('spl-dkms' "zfs-utils-common=${pkgver}" "lsb-release" "dkms")
-provides=("zfs")
+provides=("zfs" "zfs-headers")
 groups=("archzfs-dkms")
-conflicts=('zfs-dkms-git' 'zfs-archiso-linux' 'zfs-archiso-linux-git' 'zfs-linux-hardened' 'zfs-linux-hardened-git' 'zfs-linux-lts' 'zfs-linux-lts-git' 'zfs-linux' 'zfs-linux-git' 'zfs-linux-vfio' 'zfs-linux-vfio-git' 'zfs-linux-zen' 'zfs-linux-zen-git'  'zfs-archiso-linux-headers' 'zfs-archiso-linux-git-headers' 'zfs-linux-hardened-headers' 'zfs-linux-hardened-git-headers' 'zfs-linux-lts-headers' 'zfs-linux-lts-git-headers' 'zfs-linux-headers' 'zfs-linux-git-headers' 'zfs-linux-vfio-headers' 'zfs-linux-vfio-git-headers' 'zfs-linux-zen-headers' 'zfs-linux-zen-git-headers' )
+conflicts=("zfs" "zfs-headers")
 
 build() {
     cd "${srcdir}/zfs-${pkgver}"