diff --git a/scripts/Makefile b/scripts/Makefile
index bed7d6ef..b8f7ac4d 100644
--- a/scripts/Makefile
+++ b/scripts/Makefile
@@ -2,6 +2,8 @@ include ../common.mak
 
 SCRIPTS = dbginfo.sh zfcpdbf zipl-switch-to-blscfg scsi_logging_level
 SCRIPTS += sclpdbf
+# Helper scripts controlled by corresponding systemd services
+SD_HELPER_SCRIPTS = cpictl dumpconf
 MAN_PAGES = dbginfo.sh.1 zfcpdbf.1 zipl-switch-to-blscfg.1
 
 all:
@@ -17,10 +19,14 @@ install:
 		chmod 755 $(DESTDIR)$(BINDIR)/$$i; \
 	done
 
-	sed -e 's/%S390_TOOLS_VERSION%/$(S390_TOOLS_RELEASE)/' cpictl > \
-		$(DESTDIR)$(TOOLS_LIBDIR)/cpictl
-	chown $(OWNER):$(GROUP) $(DESTDIR)$(TOOLS_LIBDIR)/cpictl
-	chmod 755 $(DESTDIR)$(TOOLS_LIBDIR)/cpictl
+	@for i in $(SD_HELPER_SCRIPTS); \
+	do \
+		cat $$i | \
+		sed -e 's/%S390_TOOLS_VERSION%/$(S390_TOOLS_RELEASE)/' \
+		>$(DESTDIR)$(TOOLS_LIBDIR)/$$i; \
+		chown $(OWNER):$(GROUP) $(DESTDIR)$(TOOLS_LIBDIR)/$$i; \
+		chmod 755 $(DESTDIR)$(TOOLS_LIBDIR)/$$i; \
+	done
 
 	@for i in $(MAN_PAGES); \
 	do \
diff --git a/scripts/dumpconf b/scripts/dumpconf
index 02256655..83902f7e 100755
--- a/scripts/dumpconf
+++ b/scripts/dumpconf
@@ -101,7 +101,7 @@ EOF
 printversion()
 {
     cat <<EOF
-dumpconf: zSeries dump configuration script version 1.1
+dumpconf: zSeries dump configuration script version %S390_TOOLS_VERSION%
 Copyright IBM Corp. 2006, 2022
 EOF
 }
diff --git a/systemd/Makefile b/systemd/Makefile
index e8cdd880..76b1646f 100644
--- a/systemd/Makefile
+++ b/systemd/Makefile
@@ -18,8 +18,6 @@ install: system_units
 	  $(INSTALL) -g $(GROUP) -o $(OWNER) \
 	             -m 644 $$unit $(DESTDIR)$(SYSTEMDSYSTEMUNITDIR) ; \
 	done
-	# For systemd install dumpconf to TOOLS_LIBDIR
-	$(INSTALL) -m 755 ../scripts/dumpconf $(DESTDIR)$(TOOLS_LIBDIR)
 
 else