diff -Nru elfutils-0.187/debian/changelog elfutils-0.187/debian/changelog
--- elfutils-0.187/debian/changelog	2022-09-02 21:11:29.000000000 +0000
+++ elfutils-0.187/debian/changelog	2022-09-11 19:16:36.000000000 +0000
@@ -1,3 +1,17 @@
+elfutils (0.187-2+rpi2) bookworm-staging; urgency=medium
+
+  * Add build conflicts on libzstd-dev, if it's installed refrernces to it
+    end up in the .pc file which causes build failures downstream,
+
+ -- Peter Michael Green <plugwash@raspbian.org>  Sun, 11 Sep 2022 19:16:36 +0000
+
+elfutils (0.187-2+rpi1) bookworm-staging; urgency=medium
+
+  * Don't try to install elfutils.urls, raspbian does not currently run
+    a debuginfod service.
+
+ -- Peter Michael Green <plugwash@raspbian.org>  Fri, 09 Sep 2022 17:53:50 +0000
+
 elfutils (0.187-2) unstable; urgency=medium
 
   * Pass --sysconfdir to configure and install elfutils.urls.
diff -Nru elfutils-0.187/debian/control elfutils-0.187/debian/control
--- elfutils-0.187/debian/control	2021-12-19 00:24:02.000000000 +0000
+++ elfutils-0.187/debian/control	2022-09-11 19:16:36.000000000 +0000
@@ -15,7 +15,7 @@
   pkg-config,
   libarchive-dev <!pkg.elfutils.nodebuginfod>,
   libmicrohttpd-dev <!pkg.elfutils.nodebuginfod>, libcurl4-gnutls-dev <!pkg.elfutils.nodebuginfod>, libsqlite3-dev <!pkg.elfutils.nodebuginfod>,
-Build-Conflicts: autoconf2.13
+Build-Conflicts: autoconf2.13, libzstd-dev
 Standards-Version: 4.5.1
 Section: libs
 Homepage: https://sourceware.org/elfutils/
diff -Nru elfutils-0.187/debian/libdebuginfod-common.install elfutils-0.187/debian/libdebuginfod-common.install
--- elfutils-0.187/debian/libdebuginfod-common.install	2022-09-02 21:07:43.000000000 +0000
+++ elfutils-0.187/debian/libdebuginfod-common.install	2022-09-09 17:53:40.000000000 +0000
@@ -1,3 +1,2 @@
 etc/profile.d/debuginfod.* usr/share/libdebuginfod-common/
 usr/share/man/man7/debuginfod-client-config.7
-etc/debuginfod/elfutils.urls etc/debuginfod/