diff --git a/scripts/Makefile b/scripts/Makefile
index b8f7ac4d..d7d12f34 100644
--- a/scripts/Makefile
+++ b/scripts/Makefile
@@ -4,12 +4,12 @@ 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
+MAN_PAGES = dbginfo.sh.8 zfcpdbf.8 zipl-switch-to-blscfg.8
 
 all:
 
 install:
-	$(INSTALL) -d -m 755 $(DESTDIR)$(BINDIR) $(DESTDIR)$(MANDIR)/man1
+	$(INSTALL) -d -m 755 $(DESTDIR)$(BINDIR) $(DESTDIR)$(MANDIR)/man8
 	@for i in $(SCRIPTS); \
 	do \
 		cat $$i | \
@@ -31,7 +31,7 @@ install:
 	@for i in $(MAN_PAGES); \
 	do \
 		$(INSTALL) -g $(GROUP) -o $(OWNER) -m 644 $$i \
-		$(DESTDIR)$(MANDIR)/man1; \
+		$(DESTDIR)$(MANDIR)/man8; \
 	done
 
 clean:
diff --git a/scripts/dbginfo.sh.1 b/scripts/dbginfo.sh.8
similarity index 98%
rename from scripts/dbginfo.sh.1
rename to scripts/dbginfo.sh.8
index ece4e2af..7cd22c75 100644
--- a/scripts/dbginfo.sh.1
+++ b/scripts/dbginfo.sh.8
@@ -1,4 +1,4 @@
-.TH DBGINFO.SH  1 "September 2021" "s390-tools"
+.TH DBGINFO.SH  8 "May 2022" "s390-tools"
 
 .SH NAME
 dbginfo.sh \- collect runtime, configuration and trace information
diff --git a/scripts/zfcpdbf.1 b/scripts/zfcpdbf.8
similarity index 98%
rename from scripts/zfcpdbf.1
rename to scripts/zfcpdbf.8
index 7badf90f..46af0d4f 100644
--- a/scripts/zfcpdbf.1
+++ b/scripts/zfcpdbf.8
@@ -2,7 +2,7 @@
 .\" s390-tools is free software; you can redistribute it and/or modify
 .\" it under the terms of the MIT license. See LICENSE for details.
 .\"
-.TH ZFCPDBF 1 "DEC 2010, JUL 2016" "s390-tools"
+.TH ZFCPDBF 8 "May 2022" "s390-tools"
 
 .SH NAME
 zfcpdbf \- zfcp trace data sort/analyse tool.
diff --git a/scripts/zipl-switch-to-blscfg.1 b/scripts/zipl-switch-to-blscfg.8
similarity index 95%
rename from scripts/zipl-switch-to-blscfg.1
rename to scripts/zipl-switch-to-blscfg.8
index 8b89ecb8..09ba3315 100644
--- a/scripts/zipl-switch-to-blscfg.1
+++ b/scripts/zipl-switch-to-blscfg.8
@@ -1,4 +1,4 @@
-.TH ZIPL-SWITCH-TO-BLSCFG  1 "April 2018" "s390-tools"
+.TH ZIPL-SWITCH-TO-BLSCFG  8 "May 2022" "s390-tools"
 
 .SH NAME
 zipl-switch-to-blscfg \- Switch zipl to use BootLoaderSpec configuration