diff --git a/.gitignore b/.gitignore
index 4524524..6d2c2d4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-/v0.9.4.tar.gz
 /kpatch-dnf-v0.4.tar.gz
+/v0.9.7.tar.gz
diff --git a/kpatch.spec b/kpatch.spec
index 7975720..839b64b 100644
--- a/kpatch.spec
+++ b/kpatch.spec
@@ -1,8 +1,8 @@
 %define kpatch_dnf_ver	0.4
 
 Name:		kpatch
-Version:	0.9.4
-Release:	3%{?dist}
+Version:	0.9.7
+Release:	1%{?dist}
 Summary:	Dynamic kernel patch manager
 
 Group:		System Environment/Kernel
@@ -92,6 +92,9 @@ echo "To enable automatic kpatch-patch subscription, run:"
 echo -e "\t$ dnf kpatch auto"
 
 %changelog
+* Wed Nov 09 2022 Yannick Cote <ycote@redhat.com> 0.9.7-1
+- rebase kpatch user utility code to v0.9.7 (rhbz#2121212)
+
 * Fri Jun 10 2022 Yannick Cote <ycote@redhat.com> 0.9.4-3
 - Do not rm selinux rpm owned directory (rhbz#2053413)
 
diff --git a/sources b/sources
index 0cf3072..102aa6f 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (v0.9.4.tar.gz) = 647509fb9772b7564c0533ea043a15a66e29d413e045258036e78890c1d9cb072622bf458dda9bd4a87fe0855522c9b6ec3761f9bb4ab7e08157a179abfbaa62
 SHA512 (kpatch-dnf-v0.4.tar.gz) = d76b2ec5595e06fd560ae928f43ad275b4ce07574a1fc829d184d56c5f09a88ce0cb1d1b05e58eb53e6d934a879886b7f0149f782950d7856fbb99c61ce436c3
+SHA512 (v0.9.7.tar.gz) = c876d9b1e5f6e6ab858fa6f302e78152beb3e50cedd93f3c61ab6f747e32199b0601ad4a36d426d43d0e9a37d9bf1d6bbfddccc86df4b31d5e3e6edead6cded3