diff --git a/zfs-release/zfs-el.repo b/zfs-release/zfs-el.repo
index aafc13b9..cc4f3f47 100644
--- a/zfs-release/zfs-el.repo
+++ b/zfs-release/zfs-el.repo
@@ -1,5 +1,44 @@
+# OpenZFS provides a number of repos for users to choose from:
+#
+# [zfs] (enabled by default)
+# Provides DKMS packages that OpenZFS thinks are appropriate for your OS.
+# Typically these the same packages as 'zfs-legacy' for EL.
+#
+# [zfs-kmod]
+# Provides KMOD packages that OpenZFS thinks are appropriate for your OS.
+# Typically these are the same packages as 'zfs-legacy-kmod' for EL.
+#
+# [zfs-latest]
+# Provides DKMS packages for the latest released version of ZFS.
+#
+# [zfs-latest-kmod]
+# Provides KMOD packages for the latest released version of ZFS.
+#
+# [zfs-legacy]
+# Provides DKMS packages from the previous ZFS major version that is still
+# being actively updated.
+#
+# [zfs-legacy-kmod]
+# Provides KMOD packages from the previous ZFS major version that is still
+# being actively updated.
+#
+# [zfs-x.y]
+# Provides DKMS packages from the zfs-x.y branch.
+#
+# [zfs-x.y-kmod]
+# Provides KMOD packages from the zfs-x.y branch.
+#
+# [zfs-testing]
+# DEPRECATED in favor of 'zfs-latest'.
+#
+# [zfs-testing-kmod]
+# DEPRECATED in favor of 'zfs-latest-kmod'.
+#
+# [zfs-*source]
+# Corresponding source repos for the other repos.
+
 [zfs]
-name=ZFS on Linux for EL$releasever - dkms
+name=OpenZFS for EL$releasever - dkms
 baseurl=http://download.zfsonlinux.org/epel/$releasever/$basearch/
 enabled=1
 metadata_expire=7d
@@ -7,7 +46,7 @@ gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-openzfs-el-$releasever
 
 [zfs-kmod]
-name=ZFS on Linux for EL$releasever - kmod
+name=OpenZFS for EL$releasever - kmod
 baseurl=http://download.zfsonlinux.org/epel/$releasever/kmod/$basearch/
 enabled=0
 metadata_expire=7d
@@ -15,14 +54,14 @@ gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-openzfs-el-$releasever
 
 [zfs-source]
-name=ZFS on Linux for EL$releasever - Source
+name=OpenZFS for EL$releasever - Source
 baseurl=http://download.zfsonlinux.org/epel/$releasever/SRPMS/
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-openzfs-el-$releasever
 
 [zfs-testing]
-name=ZFS on Linux for EL$releasever - dkms - Testing
+name=OpenZFS for EL$releasever - dkms - Testing
 baseurl=http://download.zfsonlinux.org/epel-testing/$releasever/$basearch/
 enabled=0
 metadata_expire=7d
@@ -30,7 +69,7 @@ gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-openzfs-el-$releasever
 
 [zfs-testing-kmod]
-name=ZFS on Linux for EL$releasever - kmod - Testing
+name=OpenZFS for EL$releasever - kmod - Testing
 baseurl=http://download.zfsonlinux.org/epel-testing/$releasever/kmod/$basearch/
 enabled=0
 metadata_expire=7d
@@ -38,8 +77,238 @@ gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-openzfs-el-$releasever
 
 [zfs-testing-source]
-name=ZFS on Linux for EL$releasever - Testing Source
+name=OpenZFS for EL$releasever - Testing Source
 baseurl=http://download.zfsonlinux.org/epel-testing/$releasever/SRPMS/
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-openzfs-el-$releasever
+
+[zfs-latest]
+name=OpenZFS latest for EL$releasever - dkms
+baseurl=http://download.zfsonlinux.org/latest/epel/$releasever/$basearch/
+enabled=0
+metadata_expire=7d
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-openzfs-el-$releasever
+
+[zfs-latest-kmod]
+name=OpenZFS latest for EL$releasever - kmod
+baseurl=http://download.zfsonlinux.org/latest/epel/$releasever/kmod/$basearch/
+enabled=0
+metadata_expire=7d
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-openzfs-el-$releasever
+
+[zfs-latest-source]
+name=OpenZFS latest for EL$releasever - Source
+baseurl=http://download.zfsonlinux.org/latest/epel/$releasever/SRPMS/
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-openzfs-el-$releasever
+
+[zfs-legacy]
+name=OpenZFS legacy for EL$releasever - dkms
+baseurl=http://download.zfsonlinux.org/legacy/epel/$releasever/$basearch/
+enabled=0
+metadata_expire=7d
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-openzfs-el-$releasever
+
+[zfs-legacy-kmod]
+name=OpenZFS legacy for EL$releasever - kmod
+baseurl=http://download.zfsonlinux.org/legacy/epel/$releasever/kmod/$basearch/
+enabled=0
+metadata_expire=7d
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-openzfs-el-$releasever
+
+[zfs-legacy-source]
+name=OpenZFS legacy for EL$releasever - Source
+baseurl=http://download.zfsonlinux.org/legacy/epel/$releasever/SRPMS/
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-openzfs-el-$releasever
+
+[zfs-0.6]
+name=OpenZFS 0.6.x for EL$releasever - dkms
+baseurl=http://download.zfsonlinux.org/0.6/epel/$releasever/$basearch/
+enabled=0
+metadata_expire=7d
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-openzfs-el-$releasever
+
+[zfs-0.6-kmod]
+name=OpenZFS 0.6.x for EL$releasever - kmod
+baseurl=http://download.zfsonlinux.org/0.6/epel/$releasever/kmod/$basearch/
+enabled=0
+metadata_expire=7d
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-openzfs-el-$releasever
+
+[zfs-0.6-source]
+name=OpenZFS 0.6.x for EL$releasever - Source
+baseurl=http://download.zfsonlinux.org/0.6/epel/$releasever/SRPMS/
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-openzfs-el-$releasever
+
+[zfs-0.7]
+name=OpenZFS 0.7.x for EL$releasever - dkms
+baseurl=http://download.zfsonlinux.org/0.7/epel/$releasever/$basearch/
+enabled=0
+metadata_expire=7d
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-openzfs-el-$releasever
+
+[zfs-0.7-kmod]
+name=OpenZFS 0.7.x for EL$releasever - kmod
+baseurl=http://download.zfsonlinux.org/0.7/epel/$releasever/kmod/$basearch/
+enabled=0
+metadata_expire=7d
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-openzfs-el-$releasever
+
+[zfs-0.7-source]
+name=OpenZFS 0.7.x for EL$releasever - Source
+baseurl=http://download.zfsonlinux.org/0.7/epel/$releasever/SRPMS/
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-openzfs-el-$releasever
+
+[zfs-0.8]
+name=OpenZFS 0.8.x for EL$releasever - dkms
+baseurl=http://download.zfsonlinux.org/0.8/epel/$releasever/$basearch/
+enabled=0
+metadata_expire=7d
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-openzfs-el-$releasever
+
+[zfs-0.8-kmod]
+name=OpenZFS 0.8.x for EL$releasever - kmod
+baseurl=http://download.zfsonlinux.org/0.8/epel/$releasever/kmod/$basearch/
+enabled=0
+metadata_expire=7d
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-openzfs-el-$releasever
+
+[zfs-0.8-source]
+name=OpenZFS 0.8.x for EL$releasever - Source
+baseurl=http://download.zfsonlinux.org/0.8/epel/$releasever/SRPMS/
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-openzfs-el-$releasever
+
+[zfs-2.0]
+name=OpenZFS 2.0.x for EL$releasever - dkms
+baseurl=http://download.zfsonlinux.org/2.0/epel/$releasever/$basearch/
+enabled=0
+metadata_expire=7d
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-openzfs-el-$releasever
+
+[zfs-2.0-kmod]
+name=OpenZFS 2.0.x for EL$releasever - kmod
+baseurl=http://download.zfsonlinux.org/2.0/epel/$releasever/kmod/$basearch/
+enabled=0
+metadata_expire=7d
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-openzfs-el-$releasever
+
+[zfs-2.0-source]
+name=OpenZFS 2.0.x for EL$releasever - Source
+baseurl=http://download.zfsonlinux.org/2.0/epel/$releasever/SRPMS/
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-openzfs-el-$releasever
+
+[zfs-2.1]
+name=OpenZFS 2.1.x for EL$releasever - dkms
+baseurl=http://download.zfsonlinux.org/2.1/epel/$releasever/$basearch/
+enabled=0
+metadata_expire=7d
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-openzfs-el-$releasever
+
+[zfs-2.1-kmod]
+name=OpenZFS 2.1.x for EL$releasever - kmod
+baseurl=http://download.zfsonlinux.org/2.1/epel/$releasever/kmod/$basearch/
+enabled=0
+metadata_expire=7d
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-openzfs-el-$releasever
+
+[zfs-2.1-source]
+name=OpenZFS 2.1.x for EL$releasever - Source
+baseurl=http://download.zfsonlinux.org/2.1/epel/$releasever/SRPMS/
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-openzfs-el-$releasever
+
+[zfs-2.2]
+name=OpenZFS 2.2.x for EL$releasever - dkms
+baseurl=http://download.zfsonlinux.org/2.2/epel/$releasever/$basearch/
+enabled=0
+metadata_expire=7d
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-openzfs-el-$releasever
+
+[zfs-2.2-kmod]
+name=OpenZFS 2.2.x for EL$releasever - kmod
+baseurl=http://download.zfsonlinux.org/2.2/epel/$releasever/kmod/$basearch/
+enabled=0
+metadata_expire=7d
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-openzfs-el-$releasever
+
+[zfs-2.2-source]
+name=OpenZFS 2.2.x for EL$releasever - Source
+baseurl=http://download.zfsonlinux.org/2.2/epel/$releasever/SRPMS/
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-openzfs-el-$releasever
+
+[zfs-2.3]
+name=OpenZFS 2.3.x for EL$releasever - dkms
+baseurl=http://download.zfsonlinux.org/2.3/epel/$releasever/$basearch/
+enabled=0
+metadata_expire=7d
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-openzfs-el-$releasever
+
+[zfs-2.3-kmod]
+name=OpenZFS 2.3.x for EL$releasever - kmod
+baseurl=http://download.zfsonlinux.org/2.3/epel/$releasever/kmod/$basearch/
+enabled=0
+metadata_expire=7d
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-openzfs-el-$releasever
+
+[zfs-2.3-source]
+name=OpenZFS 2.3.x for EL$releasever - Source
+baseurl=http://download.zfsonlinux.org/2.3/epel/$releasever/SRPMS/
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-openzfs-el-$releasever
+
+[zfs-2.4]
+name=OpenZFS 2.4.x for EL$releasever - dkms
+baseurl=http://download.zfsonlinux.org/2.4/epel/$releasever/$basearch/
+enabled=0
+metadata_expire=7d
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-openzfs-el-$releasever
+
+[zfs-2.4-kmod]
+name=OpenZFS 2.4.x for EL$releasever - kmod
+baseurl=http://download.zfsonlinux.org/2.4/epel/$releasever/kmod/$basearch/
+enabled=0
+metadata_expire=7d
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-openzfs-el-$releasever
+
+[zfs-2.4-source]
+name=OpenZFS 2.4.x for EL$releasever - Source
+baseurl=http://download.zfsonlinux.org/2.4/epel/$releasever/SRPMS/
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-openzfs-el-$releasever
diff --git a/zfs-release/zfs-fedora.repo b/zfs-release/zfs-fedora.repo
index 424d6ce6..4c49de3c 100644
--- a/zfs-release/zfs-fedora.repo
+++ b/zfs-release/zfs-fedora.repo
@@ -1,3 +1,25 @@
+# OpenZFS provides a number of repos for users to choose from:
+#
+# [zfs] (enabled by default)
+# Provides DKMS packages that OpenZFS thinks are appropriate for your OS.
+# Typically these are same packages as 'zfs-latest' on Fedora.
+#
+# [zfs-latest]
+# Provides DKMS packages for the latest released version of ZFS.
+#
+# [zfs-legacy]
+# Provides DKMS packages from the previous ZFS major version that is still
+# being actively updated.
+#
+# [zfs-x.y]
+# Provides DKMS packages from the zfs-x.y branch.
+#
+# [zfs-testing]
+# DEPRECATED in favor of 'zfs-latest'.
+#
+# [zfs-*source]
+# Corresponding source repos for the other repos.
+
 [zfs]
 name=ZFS on Linux for Fedora $releasever
 baseurl=http://download.zfsonlinux.org/fedora/$releasever/$basearch/
@@ -22,8 +44,158 @@ gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-openzfs-fedora-$releasever
 
 [zfs-testing-source]
-name=ZFS on Linux for Fedora $releasever - Testing Source
+name=ZFS on Linux for Fedora $releasever - Testing Source (DEPRECATED)
 baseurl=http://download.zfsonlinux.org/fedora-testing/$releasever/SRPMS/
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-openzfs-fedora-$releasever
+
+[zfs-latest]
+name=OpenZFS latest for Fedora $releasever (DEPRECATED)
+baseurl=http://download.zfsonlinux.org/latest/fedora/$releasever/$basearch/
+enabled=0
+metadata_expire=7d
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-openzfs-fedora-$releasever
+
+[zfs-latest-source]
+name=OpenZFS latest for Fedora $releasever - Source
+baseurl=http://download.zfsonlinux.org/latest/fedora/$releasever/SRPMS/
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-openzfs-fedora-$releasever
+
+[zfs-legacy]
+name=OpenZFS legacy for Fedora $releasever
+baseurl=http://download.zfsonlinux.org/legacy/fedora/$releasever/$basearch/
+enabled=0
+metadata_expire=7d
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-openzfs-fedora-$releasever
+
+[zfs-legacy-source]
+name=OpenZFS legacy for Fedora $releasever - Source
+baseurl=http://download.zfsonlinux.org/legacy/fedora/$releasever/SRPMS/
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-openzfs-fedora-$releasever
+
+[zfs-0.6]
+name=OpenZFS 0.6.x for Fedora $releasever
+baseurl=http://download.zfsonlinux.org/0.6/fedora/$releasever/$basearch/
+enabled=0
+metadata_expire=7d
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-openzfs-fedora-$releasever
+
+[zfs-0.6-source]
+name=OpenZFS 0.6.x for Fedora $releasever - Source
+baseurl=http://download.zfsonlinux.org/0.6/fedora/$releasever/SRPMS/
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-openzfs-fedora-$releasever
+
+[zfs-0.7]
+name=OpenZFS 0.7.x for Fedora $releasever
+baseurl=http://download.zfsonlinux.org/0.7/fedora/$releasever/$basearch/
+enabled=0
+metadata_expire=7d
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-openzfs-fedora-$releasever
+
+[zfs-0.7-source]
+name=OpenZFS 0.7.x for Fedora $releasever - Source
+baseurl=http://download.zfsonlinux.org/0.7/fedora/$releasever/SRPMS/
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-openzfs-fedora-$releasever
+
+[zfs-0.8]
+name=OpenZFS 0.8.x for Fedora $releasever
+baseurl=http://download.zfsonlinux.org/0.8/fedora/$releasever/$basearch/
+enabled=0
+metadata_expire=7d
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-openzfs-fedora-$releasever
+
+[zfs-0.8-source]
+name=OpenZFS 0.8.x for Fedora $releasever - Source
+baseurl=http://download.zfsonlinux.org/0.8/fedora/$releasever/SRPMS/
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-openzfs-fedora-$releasever
+
+[zfs-2.0]
+name=OpenZFS 2.0.x for Fedora $releasever
+baseurl=http://download.zfsonlinux.org/2.0/fedora/$releasever/$basearch/
+enabled=0
+metadata_expire=7d
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-openzfs-fedora-$releasever
+
+[zfs-2.0-source]
+name=OpenZFS 2.0.x for Fedora $releasever - Source
+baseurl=http://download.zfsonlinux.org/2.0/fedora/$releasever/SRPMS/
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-openzfs-fedora-$releasever
+
+[zfs-2.1]
+name=OpenZFS 2.1.x for Fedora $releasever
+baseurl=http://download.zfsonlinux.org/2.1/fedora/$releasever/$basearch/
+enabled=0
+metadata_expire=7d
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-openzfs-fedora-$releasever
+
+[zfs-2.1-source]
+name=OpenZFS 2.1.x for Fedora $releasever - Source
+baseurl=http://download.zfsonlinux.org/2.1/fedora/$releasever/SRPMS/
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-openzfs-fedora-$releasever
+
+[zfs-2.2]
+name=OpenZFS 2.2.x for Fedora $releasever
+baseurl=http://download.zfsonlinux.org/2.2/fedora/$releasever/$basearch/
+enabled=0
+metadata_expire=7d
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-openzfs-fedora-$releasever
+
+[zfs-2.2-source]
+name=OpenZFS 2.2.x for Fedora $releasever - Source
+baseurl=http://download.zfsonlinux.org/2.2/fedora/$releasever/SRPMS/
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-openzfs-fedora-$releasever
+
+[zfs-2.3]
+name=OpenZFS 2.3.x for Fedora $releasever
+baseurl=http://download.zfsonlinux.org/2.3/fedora/$releasever/$basearch/
+enabled=0
+metadata_expire=7d
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-openzfs-fedora-$releasever
+
+[zfs-2.3-source]
+name=OpenZFS 2.3.x for Fedora $releasever - Source
+baseurl=http://download.zfsonlinux.org/2.3/fedora/$releasever/SRPMS/
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-openzfs-fedora-$releasever
+
+[zfs-2.4]
+name=OpenZFS 2.4.x for Fedora $releasever
+baseurl=http://download.zfsonlinux.org/2.4/fedora/$releasever/$basearch/
+enabled=0
+metadata_expire=7d
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-openzfs-fedora-$releasever
+
+[zfs-2.4-source]
+name=OpenZFS 2.4.x for Fedora $releasever - Source
+baseurl=http://download.zfsonlinux.org/2.4/fedora/$releasever/SRPMS/
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-openzfs-fedora-$releasever