diff --git a/0004-remove-confirm-prompt-when-unloading-patches.patch b/1000-remove-confirm-prompt-when-unloading-patches.patch
similarity index 100%
rename from 0004-remove-confirm-prompt-when-unloading-patches.patch
rename to 1000-remove-confirm-prompt-when-unloading-patches.patch
diff --git a/kpatch-0.9.4-sw.patch b/1001-kpatch-0.9.4-sw.patch
similarity index 50%
rename from kpatch-0.9.4-sw.patch
rename to 1001-kpatch-0.9.4-sw.patch
index 956aa7521ba1a47ee0887f9744cf2090e3a8472e..0fc012a05eabde904197d7f6c4ec5634882879a5 100644
--- a/kpatch-0.9.4-sw.patch
+++ b/1001-kpatch-0.9.4-sw.patch
@@ -1,14 +1,16 @@
-diff -Naur kpatch-0.9.4.org/kpatch-build/Makefile kpatch-0.9.4.sw/kpatch-build/Makefile
---- kpatch-0.9.4.org/kpatch-build/Makefile	2021-08-27 03:31:07.000000000 +0800
-+++ kpatch-0.9.4.sw/kpatch-build/Makefile	2023-06-13 11:09:25.078312975 +0800
-@@ -14,6 +14,10 @@
+diff -Naur kpatch-0.9.7/kpatch-build/Makefile kpatch-0.9.7.sw/kpatch-build/Makefile
+--- kpatch-0.9.7/kpatch-build/Makefile	2021-08-27 03:31:07.000000000 +0800
++++ kpatch-0.9.7/kpatch-build/Makefile	2023-06-13 11:09:25.078312975 +0800
+@@ -13,7 +13,11 @@
  SOURCES += insn/insn.c insn/inat.c
  INSN     = insn/insn.o insn/inat.o
  insn/%.o: CFLAGS := $(filter-out -Wconversion, $(CFLAGS))
-+else ifeq ($(ARCH),sw_64)
+-ifeq ($(ARCH),ppc64le)
++ifeq ($(ARCH),sw_64)
 +SOURCES += insn/insn.c insn/inat.c
 +INSN     = insn/insn.o insn/inat.o
 +insn/%.o: CFLAGS := $(filter-out -Wconversion, $(CFLAGS))
- else ifeq ($(ARCH),ppc64le)
++else ($(ARCH),ppc64le)
  SOURCES += gcc-plugins/ppc64le-plugin.c
  PLUGIN   = gcc-plugins/ppc64le-plugin.so
+ TARGETS += $(PLUGIN)
diff --git a/dist b/dist
index 9c0e36ec42a2d9bfefacb21ac6354c9ddd910533..1fe92cf0fdf9c2625d878a2ace258f64c1e8ca44 100644
--- a/dist
+++ b/dist
@@ -1 +1 @@
-an8
+an8_10
diff --git a/download b/download
index 45aade7ab21ad8994552ddef4f59027f369bb110..c9b6f89dee1378eedab3ffc3c0c554b9bff81fa9 100644
--- a/download
+++ b/download
@@ -1,2 +1,2 @@
-21d48a6aa2ff4f3afd934f7fced99018  kpatch-dnf-v0.4.tar.gz
 5e876cf28fc419ee72526a5ae26d59b0  v0.9.7.tar.gz
+0b40d0d2ed4b11c5843b675396d784fc  kpatch-dnf-v0.5.tar.gz
diff --git a/kpatch.spec b/kpatch.spec
index cdde36db69df1b07bc72a2fdba49ffbb156c8e22..01a1524b460cb53cc418f7935e1c3256ac66fafc 100644
--- a/kpatch.spec
+++ b/kpatch.spec
@@ -1,9 +1,9 @@
-%define kpatch_dnf_ver	0.4
-%define anolis_release .0.2
+%define anolis_release .0.1
+%define kpatch_dnf_ver	0.5
 
 Name:		kpatch
 Version:	0.9.7
-Release:	2%{anolis_release}%{?dist}
+Release:	3%{anolis_release}%{?dist}
 Summary:	Dynamic kernel patch manager
 
 Group:		System Environment/Kernel
@@ -16,14 +16,14 @@ Source1:	kpatch-dnf-v%{kpatch_dnf_ver}.tar.gz
 Patch0:		0001-contrib-disable-upstart-kpatch.conf-install.patch
 Patch1:		0002-kpatch-clarify-unload-unsupport.patch
 Patch2:		0003-do-not-rm-selinux-rpm-owned-directory.patch
-Patch3:     0004-remove-confirm-prompt-when-unloading-patches.patch
+Patch1000:      1000-remove-confirm-prompt-when-unloading-patches.patch
 
 # Upstream backports
 #Patch100:	0100-xxx.patch
 
 # kpatch-dnf backports
 #Patch200:	0200-xxx.patch
-Patch1000: kpatch-0.9.4-sw.patch
+Patch1001: 1001-kpatch-0.9.4-sw.patch
 
 Requires:	bash kmod binutils
 Recommends:	kpatch-dnf
@@ -54,8 +54,8 @@ kpatch-patch packages updates.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
 %patch1000 -p1
+%patch1001 -p1
 
 %setup -D -T -a 1
 cd kpatch-dnf-%{kpatch_dnf_ver}
@@ -92,11 +92,12 @@ echo "To enable automatic kpatch-patch subscription, run:"
 echo -e "\t$ dnf kpatch auto"
 
 %changelog
-* Tue Jun 13 2023 wuxiat <nijie@wuxiat.com> 0.9.7-2.0.2
+* Wed Sep 17 2025 Yongde Zhang <ydzhang@linux.alibaba.com> 0.9.7-3.0.1
+- Disable confirm prompt of kpatch script which may have nagative effect of unloading process
 - cherry-pick `add sw Patch #b079c9f333b91124926dd10c7aaf035eccc033a2`.
 
-* Tue Jul 04 2023 Yongde Zhang <ydzhang@linux.alibaba.com> 0.9.7-2.0.1
-- Disable confirm prompt of kpatch script which may have nagative effect of unloading process
+* Tue Apr 08 2025 Rado Vrbovsky <rvrbovsk@redhat.com> 0.9.7-3
+- Rebase kpatch DNF plugin with upstream to 0.5 (RHEL-85574)
 
 * Wed Nov 16 2022 Yannick Cote <ycote@redhat.com> 0.9.7-2
 - augment kpatch-dnf package versioning to satisfy build (rhbz#2121211)