diff --git a/CHANGES b/CHANGES
index ef77f885fd674f9f3ea160d31078a1310f54626b..28bd44aeb3deb29d0540d1406f08ce183357170e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -4,6 +4,17 @@
 
  Changes between 0.9.7e and 0.9.8  [xx XXX xxxx]
 
+  *) New utility extract-section.pl. This can be used specify an alternative
+     section number in a pod file instead of having to treat each file as
+     a separate case in Makefile. This can be done by adding two lines to the
+     pod file:
+
+     =for comment openssl_section:XXX
+
+     The blank line is mandatory.
+
+     [Steve Henson]
+
   *) New arguments -certform, -keyform and -pass for s_client and s_server
      to allow alternative format key and certificate files and passphrase
      sources.
diff --git a/Makefile.org b/Makefile.org
index 57f71f5abc30bf925dc8c2fe38a36bb9d9a7492f..bd952e359333942a0ac5aab01a6179bcd08667de 100644
--- a/Makefile.org
+++ b/Makefile.org
@@ -609,7 +609,7 @@ install_docs:
 	fi; \
 	set -e; for i in doc/apps/*.pod; do \
 		fn=`basename $$i .pod`; \
-		if [ "$$fn" = "config" ]; then sec=5; else sec=1; fi; \
+		sec=`$(PERL) util/extract-section.pl 1 < $$i`; \
 		echo "installing man$$sec/$$fn.$${sec}$(MANSUFFIX)"; \
 		(cd `$(PERL) util/dirname.pl $$i`; \
 		sh -c "$$pod2man \
@@ -626,7 +626,7 @@ install_docs:
 	done; \
 	set -e; for i in doc/crypto/*.pod doc/ssl/*.pod; do \
 		fn=`basename $$i .pod`; \
-		if [ "$$fn" = "des_modes" ]; then sec=7; else sec=3; fi; \
+		sec=`$(PERL) util/extract-section.pl 3 < $$i`; \
 		echo "installing man$$sec/$$fn.$${sec}$(MANSUFFIX)"; \
 		(cd `$(PERL) util/dirname.pl $$i`; \
 		sh -c "$$pod2man \
diff --git a/doc/apps/config.pod b/doc/apps/config.pod
index 2158cf4253961c16ec80ecabd658a18d1bacc13a..ace34b62bd2e6edb5b06b2890f7b2e66b026819f 100644
--- a/doc/apps/config.pod
+++ b/doc/apps/config.pod
@@ -1,6 +1,8 @@
 
 =pod
 
+=for comment openssl_manual_section:5
+
 =head1 NAME
 
 config - OpenSSL CONF library configuration files
diff --git a/doc/apps/x509v3_config.pod b/doc/apps/x509v3_config.pod
index 049e854ee894693d17b56075f1afc976ff969c0b..09954693a34a3512e9329300e958b1c24570316b 100644
--- a/doc/apps/x509v3_config.pod
+++ b/doc/apps/x509v3_config.pod
@@ -1,5 +1,7 @@
 =pod
 
+=for comment openssl_manual_section:5
+
 =head1 NAME
 
 x509v3_config - X509 V3 certificate extension configuration format
diff --git a/doc/crypto/EVP_BytesToKey.pod b/doc/crypto/EVP_BytesToKey.pod
index 016381f3e994a1f3fbf6de207dc930da2979f7cc..d375c46e03d5810b1fce1b3c4e82ba77e7e891dc 100644
--- a/doc/crypto/EVP_BytesToKey.pod
+++ b/doc/crypto/EVP_BytesToKey.pod
@@ -60,7 +60,7 @@ EVP_BytesToKey() returns the size of the derived key in bytes.
 =head1 SEE ALSO
 
 L<evp(3)|evp(3)>, L<rand(3)|rand(3)>,
-L<EVP_EncryptInit(3)|EVP_EncryptInit(3)>,
+L<EVP_EncryptInit(3)|EVP_EncryptInit(3)>
 
 =head1 HISTORY
 
diff --git a/doc/crypto/des_modes.pod b/doc/crypto/des_modes.pod
index da75e8007d454d1956a1c0153b1dc1cf691f9f88..02664036fc6c49c410966bfc802fbe5dc3efb93a 100644
--- a/doc/crypto/des_modes.pod
+++ b/doc/crypto/des_modes.pod
@@ -1,5 +1,7 @@
 =pod
 
+=for comment openssl_manual_section:7
+
 =head1 NAME
 
 Modes of DES - the variants of DES and other crypto algorithms of OpenSSL
diff --git a/util/extract-section.pl b/util/extract-section.pl
new file mode 100644
index 0000000000000000000000000000000000000000..7a0ba4f69a7a6407cd95e80a1e486d962fd54937
--- /dev/null
+++ b/util/extract-section.pl
@@ -0,0 +1,12 @@
+#!/usr/bin/perl
+
+while(<STDIN>) {
+	if (/=for\s+comment\s+openssl_manual_section:(\S+)/)
+		{
+		print "$1\n";
+		exit 0;
+		}
+}
+
+print "$ARGV[0]\n";
+