diff -Nru zeroc-ice-3.7.1/debian/changelog zeroc-ice-3.7.1/debian/changelog
--- zeroc-ice-3.7.1/debian/changelog	2018-06-06 21:28:50.000000000 +0000
+++ zeroc-ice-3.7.1/debian/changelog	2018-06-19 20:56:36.000000000 +0000
@@ -1,3 +1,9 @@
+zeroc-ice (3.7.1-2+rpi1) buster-staging; urgency=medium
+
+  * Fix FTBFs on derivatives by checking ID_LIKE in /etc/os-release
+
+ -- Peter Michael Green <plugwash@raspbian.org>  Tue, 19 Jun 2018 20:56:36 +0000
+
 zeroc-ice (3.7.1-2) unstable; urgency=medium
 
   * Do not set DH_BUILD_DDEBS in debian/rules
diff -Nru zeroc-ice-3.7.1/debian/patches/series zeroc-ice-3.7.1/debian/patches/series
--- zeroc-ice-3.7.1/debian/patches/series	2018-06-06 20:16:18.000000000 +0000
+++ zeroc-ice-3.7.1/debian/patches/series	2018-06-19 20:56:36.000000000 +0000
@@ -1 +1,2 @@
 gcc8-build-fixes.patch
+use-id-like.patch
diff -Nru zeroc-ice-3.7.1/debian/patches/use-id-like.patch zeroc-ice-3.7.1/debian/patches/use-id-like.patch
--- zeroc-ice-3.7.1/debian/patches/use-id-like.patch	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.1/debian/patches/use-id-like.patch	2018-06-19 20:56:36.000000000 +0000
@@ -0,0 +1,18 @@
+Description:  Fix FTBFs on derivatives by checking ID_LIKE in /etc/os-release
+Author: Peter Michael Green <plugwash@debian.org>
+Last-Update: 2018-06-19
+
+--- zeroc-ice-3.7.1.orig/config/Make.rules.Linux
++++ zeroc-ice-3.7.1/config/Make.rules.Linux
+@@ -7,7 +7,10 @@
+ #
+ # **********************************************************************
+ 
+-linux_id                        = $(if $(wildcard /etc/os-release),$(shell . /etc/os-release && echo $${ID}),)
++known_distros                   := yocto centos rhel fedora debian ubuntu amzn sles poky
++linux_ids                       := $(if $(wildcard /etc/os-release),$(shell . /etc/os-release && echo $${ID} $${ID_LIKE}),)
++linux_ids_filtered              := $(filter $(known_distros),$(linux_ids))
++linux_id                        := $(word 1,$(linux_ids_filtered))
+ is-bin-program                  = $(and $(filter $(bindir)%,$($4_targetdir)),$(filter $($1_target),program))
+ 
+ ifneq ($(OECORE_SDK_VERSION),)
diff -Nru zeroc-ice-3.7.1/debian/rules zeroc-ice-3.7.1/debian/rules
--- zeroc-ice-3.7.1/debian/rules	2018-06-06 20:06:49.000000000 +0000
+++ zeroc-ice-3.7.1/debian/rules	2018-06-19 20:56:36.000000000 +0000
@@ -111,6 +111,8 @@
 	for v in $(PYTHON_VERSIONS); do \
 	  rm -rf python-$${v}; \
 	done
+	rm -rf cpp/lib
+	rm -f cpp/test/Glacier2/staticFiltering/*.cfg
 
 override_dh_auto_clean-indep:
 	$(MAKE) $(MAKEOPTS) OPTIMIZE=$(OPTIMIZE) LANGUAGES=cpp distclean