diff --git a/canongnu.diff b/canongnu.diff
index fed586e..cd8e81d 100644
--- a/canongnu.diff
+++ b/canongnu.diff
@@ -1,11 +1,32 @@
---- CMakeLists.txt.orig	2023-10-13 12:38:26.953411554 +0000
-+++ CMakeLists.txt	2023-10-13 12:40:11.057239934 +0000
-@@ -144,7 +144,7 @@ function(makemacros)
+--- CMakeLists.txt.orig	2024-02-07 09:57:31.944781372 +0000
++++ CMakeLists.txt	2024-02-07 09:57:51.924739495 +0000
+@@ -138,14 +138,26 @@ function(makemacros)
+ 
+ 	list(GET db_backends 0 DB_BACKEND)
+ 
+-	set(host_cpu ${CMAKE_HOST_SYSTEM_PROCESSOR})
++	if (RPM_HOST_SYSTEM_CPU)
++	    set(host_cpu ${RPM_HOST_SYSTEM_CPU})
++	else()
++	    set(host_cpu ${CMAKE_HOST_SYSTEM_PROCESSOR})
++	endif()
+ 	string(TOLOWER ${CMAKE_HOST_SYSTEM_NAME} host_os)
+ 	set(host_vendor ${RPM_VENDOR})
+-	set(host ${host_cpu}-${host_vendor}-${host_os})
++	if (RPM_HOST_SYSTEM_ABI)
++	    set(host ${host_cpu}-${host_vendor}-${host_os}-${RPM_HOST_SYSTEM_ABI})
++	else()
++	    set(host ${host_cpu}-${host_vendor}-${host_os})
++	endif()
  
  	set(RPMCANONVENDOR ${host_vendor})
  	set(RPMCANONOS ${host_os})
 -	set(RPMCANONGNU -gnu)
-+	set(RPMCANONGNU -gnu CACHE STRING "gnu os suffix")
++	if (RPM_HOST_SYSTEM_ABI)
++	    set(RPMCANONGNU -${RPM_HOST_SYSTEM_ABI})
++	else()
++	    set(RPMCANONGNU -gnu)
++	endif()
  
  	if (ENABLE_CUTF8)
  		set(C_LOCALE "C.UTF-8")
diff --git a/cmake_hostsystemabi.diff b/cmake_hostsystemabi.diff
deleted file mode 100644
index 11973d1..0000000
--- a/cmake_hostsystemabi.diff
+++ /dev/null
@@ -1,23 +0,0 @@
---- CMakeLists.txt.orig	2024-02-07 09:31:31.612063670 +0000
-+++ CMakeLists.txt	2024-02-07 09:48:38.869899281 +0000
-@@ -138,10 +138,18 @@ function(makemacros)
- 
- 	list(GET db_backends 0 DB_BACKEND)
- 
--	set(host_cpu ${CMAKE_HOST_SYSTEM_PROCESSOR})
-+	if (RPM_HOST_SYSTEM_CPU)
-+	    set(host_cpu ${RPM_HOST_SYSTEM_CPU})
-+	else()
-+	    set(host_cpu ${CMAKE_HOST_SYSTEM_PROCESSOR})
-+	endif()
- 	string(TOLOWER ${CMAKE_HOST_SYSTEM_NAME} host_os)
- 	set(host_vendor ${RPM_VENDOR})
--	set(host ${host_cpu}-${host_vendor}-${host_os})
-+	if (RPM_HOST_SYSTEM_ABI)
-+	    set(host ${host_cpu}-${host_vendor}-${host_os}-${RPM_HOST_SYSTEM_ABI})
-+	else()
-+	    set(host ${host_cpu}-${host_vendor}-${host_os})
-+	endif()
- 
- 	set(RPMCANONVENDOR ${host_vendor})
- 	set(RPMCANONOS ${host_os})
diff --git a/rpm.changes b/rpm.changes
index 3743710..2affdd4 100644
--- a/rpm.changes
+++ b/rpm.changes
@@ -2,7 +2,7 @@
 Wed Feb  7 10:34:35 CET 2024 - mls@suse.de
 
 - fix %_host not containing the abi suffix on arm [bnc#1219627]
-  new patch: cmake_hostsystemabi.diff
+  updated patch: canongnu.diff
 
 -------------------------------------------------------------------
 Fri Feb  2 15:27:57 UTC 2024 - Ben Greiner <code@bnavigator.de>
diff --git a/rpm.spec b/rpm.spec
index a2982c9..89b42df 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -113,7 +113,6 @@ Patch135:       selinux_transactional_update.patch
 Patch136:       rpmsort_reverse.diff
 Patch138:       canongnu.diff
 Patch139:       cmake_python_version.diff
-Patch140:       cmake_hostsystemabi.diff
 Patch6464:      auto-config-update-aarch64-ppc64le.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 #
@@ -227,7 +226,7 @@ rm -rf sqlite
 %patch                                                  -P 117
 %patch -P 122 -P 123
 %patch -P 131          -P 133 -P 134 -P 135 -P 136        -P 138
-%patch -P 139 -P 140
+%patch -P 139
 
 %ifarch aarch64 ppc64le riscv64
 %patch6464
@@ -247,7 +246,6 @@ mkdir _build
 cd _build
 cmake .. \
 %ifarch %arm
-  -DRPMCANONGNU=-gnueabi \
   -DRPM_HOST_SYSTEM_ABI=gnueabi \
 %endif
   -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \