diff --git a/.gitignore b/.gitignore
index b377e5081238eb7cacab8a93cfe555a2619b8697..1d5a48caf8303f420650cc881f34978f235e5933 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,7 +30,7 @@ Makefile
 shim/*.so.c
 shim/*.so.symbols
 shim/*.so.map
-elf-dump
+/capsule-elf-dump
 print-libstubs
 capsule-symbols
 capsule-version
diff --git a/Makefile.am b/Makefile.am
index a2f1af659e1afe3b1d88d909f2c3b771cfa50f3c..2fca72cc170e5944b119c74351d8db205c525214 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -49,8 +49,10 @@ data/$(host)-capsule-mkstublib: data/capsule-mkstublib Makefile
 install-exec-hook:
 	cd $(DESTDIR)$(bindir) && ln -f capsule-symbols $(host)-capsule-symbols
 	cd $(DESTDIR)$(bindir) && ln -f capsule-version $(host)-capsule-version
+	cd $(DESTDIR)$(bindir) && ln -f capsule-elf-dump $(host)-capsule-elf-dump
 
 uninstall-hook:
+	cd $(DESTDIR)$(bindir) && rm -f $(host)-capsule-elf-dump
 	cd $(DESTDIR)$(bindir) && rm -f $(host)-capsule-symbols
 	cd $(DESTDIR)$(bindir) && rm -f $(host)-capsule-version
 
@@ -58,13 +60,13 @@ uninstall-hook:
 nobase_include_HEADERS += capsule/capsule-shim.h \
                           capsule/_int_dlopen.h
 
-# demo program - keep this hanging around as it's a useful PoC
-noinst_PROGRAMS         = elf-dump
+# Mostly just a demo program, but keep this hanging around as it's a useful PoC
+bin_PROGRAMS           += capsule-elf-dump
 
-elf_dump_SOURCES        = utils/elf-dump.c utils/utils.c
-elf_dump_LDADD          = -ldl
-elf_dump_SOURCES       += utils/utils.h
-elf_dump_CFLAGS         = $(AM_CFLAGS)
+capsule_elf_dump_SOURCES        = utils/elf-dump.c utils/utils.c
+capsule_elf_dump_LDADD          = -ldl
+capsule_elf_dump_SOURCES       += utils/utils.h
+capsule_elf_dump_CFLAGS         = $(AM_CFLAGS)
 
 # now the rules for building our installables:
 capsule_symbols_SOURCES = utils/print-libstubs.c \
diff --git a/debian/libcapsule-tools.install b/debian/libcapsule-tools.install
index f11f9e6d52614461eaca4ee8d2fe38ee1abf5d36..2a2896efcb5728e4744b770f1663385d35081fdb 100644
--- a/debian/libcapsule-tools.install
+++ b/debian/libcapsule-tools.install
@@ -1,3 +1,4 @@
+usr/bin/*-capsule-elf-dump
 usr/bin/*-capsule-mkstublib
 usr/bin/*-capsule-symbols
 usr/bin/*-capsule-version
diff --git a/debian/rules b/debian/rules
index 1e23ba69c97d2cbb779741f2137c7d99bd8bdff7..75ca8b14261a68cbb099bda84ada1712d3892cd1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -58,6 +58,7 @@ override_dh_install:
 	find debian/tmp/usr/lib/libcapsule/installed-tests -name '*.la' -print -delete
 	# Only keep the architecture-qualified version, delete the unprefixed
 	# version, so we can be Multi-Arch: same
+	rm -f debian/tmp/usr/bin/capsule-elf-dump
 	rm -f debian/tmp/usr/bin/capsule-symbols
 	rm -f debian/tmp/usr/bin/capsule-version
 	dh_install --fail-missing