diff --git a/.gitignore b/.gitignore
index e39954c..ab97398 100644
--- a/.gitignore
+++ b/.gitignore
@@ -45,6 +45,7 @@ Makefile.in
 # man pages
 *.1
 *.3
+*.5
 
 # tests
 test-driver
diff --git a/check-release.sh b/check-release.sh
index a7cf8ec..bdafa08 100755
--- a/check-release.sh
+++ b/check-release.sh
@@ -57,6 +57,7 @@ fi
 echo "differences between release and regenerated release tag:"
 diff -urN \
 	-x *.3 \
+	-x *.5 \
 	-x Makefile.in \
 	-x aclocal.m4 \
 	-x compile \
diff --git a/dist.sh b/dist.sh
index bdb549a..9a2f001 100755
--- a/dist.sh
+++ b/dist.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 set -e
 
-rm -f man/*.1 man/*.3 include/openssl/*.h
+rm -f man/*.[35] include/openssl/*.h
 ./autogen.sh
 ./configure
 make -j2 distcheck
diff --git a/man/CMakeLists.txt b/man/CMakeLists.txt
index 639b9ed..462a831 100644
--- a/man/CMakeLists.txt
+++ b/man/CMakeLists.txt
@@ -5,7 +5,7 @@ if(ENABLE_LIBRESSL_INSTALL)
 	    )
 
 	install(DIRECTORY .
-	    DESTINATION ${CMAKE_INSTALL_MANDIR}/man1
-	    FILES_MATCHING PATTERN "*.1"
+	    DESTINATION ${CMAKE_INSTALL_MANDIR}/man5
+	    FILES_MATCHING PATTERN "*.5"
 	    )
 endif(ENABLE_LIBRESSL_INSTALL)
diff --git a/update.sh b/update.sh
index ec69dfc..8ffb507 100755
--- a/update.sh
+++ b/update.sh
@@ -347,7 +347,7 @@ echo dist_man_MANS = >> man/Makefile.am
 		echo "dist_man_MANS += $NAME" >> Makefile.am
 	done
 
-	for i in `ls -1 $libcrypto_src/man/*.3 | sort`; do
+	for i in `ls -1 $libcrypto_src/man/*.[35] | sort`; do
 		NAME=`basename "$i"`
 		$CP $i .
 		echo "dist_man_MANS += $NAME" >> Makefile.am