diff --git a/rpm.spec b/rpm.spec
index 5a8f0c0..95014a8 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -32,7 +32,7 @@
 
 %global rpmver 4.16.1.3
 #global snapver rc1
-%global rel 23
+%global rel 24
 %global sover 9
 
 %global srcver %{rpmver}%{?snapver:-%{snapver}}
@@ -356,6 +356,9 @@ Requires: rpm-libs%{_isa} = %{version}-%{release}
 %prep
 %autosetup -n rpm-%{srcver} %{?with_int_bdb:-a 1} -p1
 
+# Use external find-debuginfo
+sed -i -e "s:%%{_rpmconfigdir}/find-debuginfo.sh:%%{_bindir}/find-debuginfo.sh:g" macros.in
+
 %if %{with bdb} && %{with int_bdb}
 ln -s db-%{bdbver} db
 %endif
@@ -418,11 +421,8 @@ pushd python
 %py3_install
 popd
 
-# replace in-tree debugedit with upstream one
-rm $RPM_BUILD_ROOT/%{rpmhome}/debugedit
-rm $RPM_BUILD_ROOT/%{rpmhome}/find-debuginfo.sh
-ln -s ../../bin/debugedit $RPM_BUILD_ROOT/%{rpmhome}/debugedit
-ln -s ../../bin/find-debuginfo $RPM_BUILD_ROOT/%{rpmhome}/find-debuginfo.sh
+# remove in-tree debugedit as we now use the debugedit package
+rm -f $RPM_BUILD_ROOT/%{rpmhome}/{debugedit,sepdebugcrcfix,find-debuginfo.sh}
 
 mkdir -p $RPM_BUILD_ROOT%{_unitdir}
 install -m 644 %{SOURCE10} $RPM_BUILD_ROOT/%{_unitdir}
@@ -599,9 +599,6 @@ fi
 
 %{rpmhome}/brp-*
 %{rpmhome}/check-*
-%{rpmhome}/debugedit
-%{rpmhome}/sepdebugcrcfix
-%{rpmhome}/find-debuginfo.sh
 %{rpmhome}/find-lang.sh
 %{rpmhome}/*provides*
 %{rpmhome}/*requires*
@@ -636,10 +633,12 @@ fi
 
 %changelog
 
+* Thu May 04 2023 Florian Festi <ffesti@redhat.com> - 4.16.1.3-24
+- Use external find-debug and debugedit (#2166383)
+
 * Wed May 03 2023 Florian Festi <ffesti@redhat.com> - 4.16.1.3-23
 - Don't error out on IMA signatures on files not supporting them
   (#2157835, #2157836)
-- Use external find-debug and debugedit (#2166383)
 
 * Mon Dec 19 2022 Florian Festi <ffesti@redhat.com> - 4.16.1.3-22
 - Fix option handling in rpm2archive for #2150804