diff --git a/.gitignore b/.gitignore
index 129fbb6..6d2c2d4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,2 @@
-/v0.9.4.tar.gz
-/v0.9.7.tar.gz
 /kpatch-dnf-v0.4.tar.gz
+/v0.9.7.tar.gz
diff --git a/kpatch.spec b/kpatch.spec
index fbbcd37..4f17474 100644
--- a/kpatch.spec
+++ b/kpatch.spec
@@ -2,7 +2,7 @@
 
 Name:		kpatch
 Version:	0.9.7
-Release:	1.1%{?dist}
+Release:	2.1%{?dist}
 Summary:	Dynamic kernel patch manager
 
 Group:		System Environment/Kernel
@@ -57,8 +57,8 @@ a collection of binary kernel patch modules which can be used to dynamically
 patch the kernel without rebooting.
 
 %package -n kpatch-dnf
-Summary:	patch-patch manager plugin for DNF
-Version:	%kpatch_dnf_ver
+Summary:	kpatch-patch manager plugin for DNF
+Version:	%{version}_%{kpatch_dnf_ver}
 BuildRequires:	python3-devel python3-dnf
 Requires:	python3-dnf python3-hawkey
 Provides:	kpatch-dnf
@@ -126,6 +126,15 @@ echo "To enable automatic kpatch-patch subscription, run:"
 echo -e "\t$ dnf kpatch auto"
 
 %changelog
+* Wed Dec 07 2022 Davide Cavalca <dcavalca@centosproject.org> - 0.9.7-2.1
+- Merge upstream changes into Hyperscale
+
+* Wed Nov 16 2022 Yannick Cote <ycote@redhat.com> 0.9.7-2
+- augment kpatch-dnf package versioning to satisfy build (rhbz#2121212)
+
+* Wed Nov 09 2022 Yannick Cote <ycote@redhat.com> 0.9.7-1
+- rebase kpatch user utility code to v0.9.7 (rhbz#2121212)
+
 * Tue Oct 25 2022 Davide Cavalca <dcavalca@centosproject.org> - 0.9.7-1.1
 - Update to 0.9.7
 - Backport patches for clang PGO
diff --git a/sources b/sources
index 670583b..102aa6f 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (v0.9.7.tar.gz) = c876d9b1e5f6e6ab858fa6f302e78152beb3e50cedd93f3c61ab6f747e32199b0601ad4a36d426d43d0e9a37d9bf1d6bbfddccc86df4b31d5e3e6edead6cded3
 SHA512 (kpatch-dnf-v0.4.tar.gz) = d76b2ec5595e06fd560ae928f43ad275b4ce07574a1fc829d184d56c5f09a88ce0cb1d1b05e58eb53e6d934a879886b7f0149f782950d7856fbb99c61ce436c3
+SHA512 (v0.9.7.tar.gz) = c876d9b1e5f6e6ab858fa6f302e78152beb3e50cedd93f3c61ab6f747e32199b0601ad4a36d426d43d0e9a37d9bf1d6bbfddccc86df4b31d5e3e6edead6cded3