diff --git a/cpumf/Makefile b/cpumf/Makefile
index e61cfe1c..1f37055b 100644
--- a/cpumf/Makefile
+++ b/cpumf/Makefile
@@ -1,7 +1,7 @@
 include ../common.mak
 
 BIN_FILES = lscpumf chcpumf lshwc pai
-MAN_FILES = lscpumf.1 chcpumf.8 lshwc.1 pai.1
+MAN_FILES = lscpumf.8 chcpumf.8 lshwc.8 pai.8
 
 all: $(BIN_FILES)
 
@@ -23,8 +23,8 @@ clean:
 
 install-man:
 	for man in $(MAN_FILES); do \
-	  msection=`echo $$man |sed 's/.*\.\([1-9]\)$$/man\1/'` ; \
-	  $(INSTALL) -g $(GROUP) -o $(OWNER) -m 644 -D man/$$man $(DESTDIR)$(MANDIR)/$$msection/$$man ; \
+		$(INSTALL) -g $(GROUP) -o $(OWNER) -m 644 man/$$man \
+		$(DESTDIR)$(MANDIR)/man8 ; \
 	done
 
 .PHONY: all install clean
diff --git a/cpumf/man/lscpumf.1 b/cpumf/man/lscpumf.8
similarity index 96%
rename from cpumf/man/lscpumf.1
rename to cpumf/man/lscpumf.8
index 2a908533..6c66cf7f 100644
--- a/cpumf/man/lscpumf.1
+++ b/cpumf/man/lscpumf.8
@@ -1,11 +1,11 @@
-\" lscpumf.1
+\" lscpumf.8
 .\"
 .\"
 .\" Copyright IBM Corp. 2014, 2020
 .\" 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 lscpumf "1" "May 2020" "s390-tools" "CPU-MF management programs"
+.TH lscpumf "8" "May 2022" "s390-tools" "CPU-MF management programs"
 .
 .ds c \fBlscpumf\fP
 .
diff --git a/cpumf/man/lshwc.1 b/cpumf/man/lshwc.8
similarity index 97%
rename from cpumf/man/lshwc.1
rename to cpumf/man/lshwc.8
index b7b69431..c52fbdb5 100644
--- a/cpumf/man/lshwc.1
+++ b/cpumf/man/lshwc.8
@@ -1,4 +1,4 @@
-.\" lshwc.1
+.\" lshwc.8
 .\"
 .\"
 .\" Copyright IBM Corp. 2021
@@ -7,7 +7,7 @@
 .\" ----------------------------------------------------------------------
 .ds c \fBlshwc\fP
 .
-.TH \*c "1" "February 2021" "s390-tools" "CPU-MF management programs"
+.TH \*c "8" "May 2022" "s390-tools" "CPU-MF management programs"
 .
 .SH NAME
 \*c \- extract CPU Measurement Facilities counter sets
@@ -130,5 +130,5 @@ Date,Time,CPU,PROBLEM_STATE_CPU_CYCLES(32),PROBLEM_STATE_INSTRUCTIONS(33)
 .ft
 .fi
 .SH "SEE ALSO"
-.BR lscpumf (1)
+.BR lscpumf (8)
 .BR chcpumf (8)
diff --git a/cpumf/man/pai.1 b/cpumf/man/pai.8
similarity index 99%
rename from cpumf/man/pai.1
rename to cpumf/man/pai.8
index 5893ed6e..6107f280 100644
--- a/cpumf/man/pai.1
+++ b/cpumf/man/pai.8
@@ -1,4 +1,4 @@
-.\" pai.1
+.\" pai.8
 .\"
 .\"
 .\" Copyright IBM Corp. 2022
@@ -7,7 +7,7 @@
 .\" ----------------------------------------------------------------------
 .ds c \fBpai\fP
 .
-.TH \*c "1" "May 2022" "s390-tools" "PAI Management Programs"
+.TH \*c "8" "May 2022" "s390-tools" "PAI Management Programs"
 .
 .SH NAME
 \*c \- record and report Processor Activity Instrumentation (PAI) counters