diff -Nru adacontrol-1.19r10/debian/changelog adacontrol-1.19r10/debian/changelog
--- adacontrol-1.19r10/debian/changelog	2018-01-01 23:44:44.000000000 +0000
+++ adacontrol-1.19r10/debian/changelog	2018-01-02 16:38:30.000000000 +0000
@@ -1,3 +1,9 @@
+adacontrol (1.19r10-2) unstable; urgency=medium
+
+  * Remove remaining calls to Build-Depends-Arch during -indep builds.
+
+ -- Nicolas Boulenguez <nicolas@debian.org>  Tue, 02 Jan 2018 17:38:30 +0100
+
 adacontrol (1.19r10-1) unstable; urgency=medium
 
   * New upstream release.
diff -Nru adacontrol-1.19r10/debian/rules adacontrol-1.19r10/debian/rules
--- adacontrol-1.19r10/debian/rules	2018-01-01 23:17:24.000000000 +0000
+++ adacontrol-1.19r10/debian/rules	2018-01-02 16:38:11.000000000 +0000
@@ -16,11 +16,16 @@
 # The full text of the GNU General Public License is in the file
 # /usr/share/common-licenses/GPL on Debian systems.
 
-gnatgcc_base_version := $(shell gnatgcc -dumpversion)
 DEB_BUILD_MAINT_OPTIONS := hardening=+all
 include /usr/share/dpkg/default.mk
-include /usr/share/ada/debian_packaging-$(gnatgcc_base_version).mk
-ADAFLAGS += -gnatwa
+ifneq (,$(wildcard /usr/bin/gnatgcc)) # Build-Depends-Arch are installed.
+  gnat_version := $(shell /usr/bin/gnatgcc --version | sed -n '1s/.* //p')
+  gnat_base_version := $(basename $(basename $(gnat_version)))
+  include /usr/share/ada/debian_packaging-$(gnat_base_version).mk
+  ADAFLAGS += -gnatwa
+endif
+
+executables := adactl pfni ptree adactl_fix
 
 %:
 	dh $@
@@ -32,7 +37,8 @@
 	$(MAKE) build 'CARGS=$(ADAFLAGS)' \
 	  'GARGS=$(BUILDER_OPTIONS) "-XLDFLAGS=$(LDFLAGS)"'
 override_dh_auto_clean::
-	$(MAKE) veryclean
+  # Rewrite the veryclean target without Build-Depends-Arch.
+	rm -f src/*.ali src/*.o $(foreach e,$(executables),$(e) src/$(e).bexch src/b__$(e).ad[bs])
 
 override_dh_auto_build-indep:
 ifeq (,$(filter nodoc,$(DEB_BUILD_OPTIONS)))
@@ -53,11 +59,10 @@
 	rm -fr test/res
 	rm -f $(addprefix test/,*.ali *.adt)
 
-GNAT_VERSION := $(shell gnat --version | head -n1)
 override_dh_auto_test-arch: test/ref/tfw_help.txt~
 test/ref/tfw_help.txt~:
 	sed -i~ \
-	  's/^\(ADACTL v\. \).*\( with ASIS .* for \)GNAT .*/\1$(DEB_VERSION_UPSTREAM)\2$(GNAT_VERSION)/' \
+	  's/^\(ADACTL v\. \).*\( with ASIS .* for GNAT \).*/\1$(DEB_VERSION_UPSTREAM)\2$(gnat_version)/' \
 	  test/ref/tfw_help.txt
 override_dh_auto_clean::
 	if test -f test/ref/tfw_help.txt~; then \