diff --git a/efivar-filter-gcc-march.patch b/efivar-filter-gcc-march.patch
index d1538a8..71acff0 100644
--- a/efivar-filter-gcc-march.patch
+++ b/efivar-filter-gcc-march.patch
@@ -1,12 +1,15 @@
 From 85419ca09d225630cd1740e554bfb65c560e3904 Mon Sep 17 00:00:00 2001
 From: Gary Lin <glin@suse.com>
 Date: Wed, 21 Dec 2022 14:49:34 +0800
-Subject: [PATCH] Exclude '-march=native' from ppc64le and riscv64
+Date: Tue, 08 Oct 2024 04:18:22 +0800
+Subject: [PATCH] Exclude '-march=native' from all archs
 
-Since gcc of ppc64le and riscv64 doesn't support '-march=native', remove
-it from HOST_CPPFLAGS.
+Since we do not want our build results to depend on the build machine's CPU,
+remove it from HOST_CPPFLAGS.
+fixes https://bugzilla.opensuse.org/show_bug.cgi?id=1231368
 
 Signed-off-by: Gary Lin <glin@suse.com>
+Signed-off-by: Bernhard M. Wiedemann <bwiedemann suse.com>
 ---
  src/include/defaults.mk | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
@@ -20,7 +23,7 @@ index 9da5182..94502ed 100644
  
  HOST_ARCH=$(shell uname -m)
 -ifneq ($(HOST_ARCH),ia64)
-+ifeq (, $(filter ia64 riscv64 ppc64le, $(HOST_ARCH)))
++ifeq (0,1)
  	HOST_MARCH=-march=native
  else
  	HOST_MARCH=
diff --git a/efivar.changes b/efivar.changes
index e61d927..af13434 100644
--- a/efivar.changes
+++ b/efivar.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Tue Oct  8 02:18:42 UTC 2024 - Bernhard Wiedemann <bwiedemann@suse.com>
+
+- Adapt efivar-filter-gcc-march.patch to drop -march=native (boo#1231368)
+
+-------------------------------------------------------------------
+Wed Oct 11 16:37:24 UTC 2023 - Matej Cepl <mcepl@cepl.eu>
+
+- We don’t mandoc at all after all (gh#rhboot/efivar#229 and
+  gh#rhboot/efivar#253).
+
 -------------------------------------------------------------------
 Fri Feb 10 07:21:31 UTC 2023 - Gary Ching-Pang Lin <glin@suse.com>
 
diff --git a/efivar.spec b/efivar.spec
index d81d5bb..d346c92 100644
--- a/efivar.spec
+++ b/efivar.spec
@@ -31,7 +31,6 @@ Patch2:         efivar-adjust-dependency.patch
 Patch3:         efivar-filter-gcc-march.patch
 Patch4:         efivar-bsc1206388-revamp-efi_well_known-variable-handling.patch
 BuildRequires:  fdupes
-BuildRequires:  mandoc
 BuildRequires:  pkgconfig
 BuildRequires:  pkgconfig(popt)
 Requires:       libefivar%{major} = %{version}-%{release}
@@ -57,6 +56,9 @@ Development headers required to use libefivar.
 %prep
 %autosetup -p1
 
+# Avoid rebuilding gh#rhboot/efivar#229 and gh#rhboot/efivar#253
+mv -v docs/efisecdb.1{.mdoc,}
+
 %build
 CFLAGS="%{optflags} -Wno-nonnull -flto"
 %ifarch ia64