diff --git a/common.mak b/common.mak
index 02f86975..bf5b3c8d 100644
--- a/common.mak
+++ b/common.mak
@@ -267,6 +267,8 @@ USRLIB64DIR     = $(INSTALLDIR)/usr/lib64
 SYSCONFDIR      = $(INSTALLDIR)/etc
 DATADIR         = $(INSTALLDIR)/usr/share
 MANDIR          = $(DATADIR)/man
+BASHCOMPLETIONDIR = $(DATADIR)/bash-completion/completions
+ZSHCOMPLETIONDIR = $(DATADIR)/zsh/site-functions
 VARDIR          = $(INSTALLDIR)/var
 TOOLS_DATADIR   = $(DATADIR)/s390-tools
 TOOLS_LIBDIR    = $(INSTALLDIR)/lib/s390-tools
diff --git a/rust/Makefile b/rust/Makefile
index 1a4f0059..19255d12 100644
--- a/rust/Makefile
+++ b/rust/Makefile
@@ -116,7 +116,17 @@ install-man:
 	$(foreach target,$(PV_TARGETS),\
 		$(INSTALL) -m 644 $(target)/man/*.1 -t $(DESTDIR)$(MANDIR)/man1;)
 
-.PHONY: all install clean skip-build install-rust-tools print-rust-targets install-man rust-test
+install-bash-completion: $(PV_TARGETS)
+	$(INSTALL) -d -m 755 $(DESTDIR)$(BASHCOMPLETIONDIR)
+	$(foreach target,$(PV_TARGETS),\
+		$(INSTALL) $(shell find $(shell ls --sort=time --reverse --directory target/release/build/$(target)-*/out/ |tail -n1) -name '*.bash') $(DESTDIR)$(BASHCOMPLETIONDIR);)
+
+install-zsh-completion: $(PV_TARGETS)
+	$(INSTALL) -d -m 755 $(DESTDIR)$(ZSHCOMPLETIONDIR)
+	$(foreach target,$(PV_TARGETS),\
+		$(INSTALL) $(shell find $(shell ls --sort=time --reverse --directory target/release/build/$(target)-*/out/ |tail -n1) -regex '.*/_[a-zA-Z0-9]+') $(DESTDIR)$(ZSHCOMPLETIONDIR);)
+
+.PHONY: all install clean skip-build install-rust-tools print-rust-targets install-man rust-test install-bash-completion install-zsh-completion
 
 .check-cargo:
 ifeq ($(shell command -v $(CARGO)),)