diff --git a/macros b/macros
index 7c47920..3300d9a 100644
--- a/macros
+++ b/macros
@@ -320,6 +320,9 @@ print(result)
 %_annotation_plugin     %{?_annotated_build:%{expand:%%{_annobin_%{toolchain}_plugin}}}
 %_annotation_cflags     %[ "%{_target_cpu}" == "armv7hl" ? "" : "%{_annotation_plugin}" ]
 %_annotation_ldflags	%{?_lto_cflags:%{_annotation_cflags}}
+# Use the remove-section option to force the find-debuginfo script
+# to move the annobin notes into the separate debuginfo file.
+%_find_debuginfo_extra_opts %{?_annotated_build:--remove-section .gnu.build.attributes}
 
 # Fail linking if there are undefined symbols.  Required for proper
 # ELF symbol versioning support.  Disabled by default.
diff --git a/redhat-rpm-config.spec b/redhat-rpm-config.spec
index d178469..d0dc87a 100644
--- a/redhat-rpm-config.spec
+++ b/redhat-rpm-config.spec
@@ -4,7 +4,7 @@
 # 2) When making changes, increment the version (in baserelease) by 1.
 #    rpmdev-bumpspec and other tools update the macro below, which is used
 #    in Version: to get the desired effect.
-%global baserelease 224
+%global baserelease 225
 
 Summary: Red Hat specific rpm configuration files
 Name: redhat-rpm-config
@@ -219,6 +219,10 @@ install -p -m 644 -t %{buildroot}%{_rpmluadir}/fedora/srpm forge.lua
 %doc buildflags.md
 
 %changelog
+* Fri Jun 17 2022 Nick Clifton  <nickc@redhat.com> - 225-1
+- Add definition of _find_debuginfo_extra_opts which will
+-  move annobin data into a separate debuginfo file.
+
 * Tue Jun 14 2022 Tom Stellard <tstellar@redhat.com> - 224-1
 - Fix passing of CFLAGS to brp-llvm-compile-lto-elf