diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl
index 8d1dfbe..c24ba62 100644
--- a/Configurations/unix-Makefile.tmpl
+++ b/Configurations/unix-Makefile.tmpl
@@ -573,12 +573,9 @@
 	set -e; \
 	here=`cd $(SRCDIR); pwd`; \
 	point=$$here/util/point.sh; \
-	for ds in apps:1 crypto:3 ssl:3; do \
-	    defdir=`echo $$ds | cut -f1 -d:`; \
-	    defsec=`echo $$ds | cut -f2 -d:`; \
-	    for p in $(SRCDIR)/doc/$$defdir/*.pod; do \
-		SEC=`sed -ne 's/^=for  *comment  *openssl_manual_section: *\([0-9]\) *$$/\1/p' $$p`; \
-		[ -z "$$SEC" ] && SEC=$$defsec; \
+	for ds in man1 man3 man5 man7 ; do \
+	    SEC=`echo $$ds | sed -e s/man//`; \
+	    for p in $(SRCDIR)/doc/$$ds/*.pod; do \
 		fn=`basename $$p .pod`; \
 		Name=$$fn; \
 		NAME=`echo $$fn | tr '[a-z]' '[A-Z]'`; \
@@ -608,12 +605,9 @@
 UNINSTALL_DOCS=\
 	set -e; \
 	here=`cd $(SRCDIR); pwd`; \
-	for ds in apps:1 crypto:3 ssl:3; do \
-	    defdir=`echo $$ds | cut -f1 -d:`; \
-	    defsec=`echo $$ds | cut -f2 -d:`; \
-	    for p in $(SRCDIR)/doc/$$defdir/*.pod; do \
-		SEC=`sed -ne 's/^=for  *comment  *openssl_manual_section: *\([0-9]\) *$$/\1/p' $$p`; \
-		[ -z "$$SEC" ] && SEC=$$defsec; \
+	for ds in man1 man3 man5 man7 ; do \
+	    SEC=`echo $$ds | sed -e s/man//`; \
+	    for p in $(SRCDIR)/doc/$$ds/*.pod; do \
 		fn=`basename $$p .pod`; \
 		suf=`eval "echo $$OUTSUFFIX"`; \
 		top=`eval "echo $$OUTTOP"`; \
diff --git a/doc/README b/doc/README
index 5931290..ead1be2 100644
--- a/doc/README
+++ b/doc/README
@@ -9,12 +9,18 @@
 
 HOWTO/
         A few how-to documents; not necessarily up-to-date
-apps/
+
+man1/
         The openssl command-line tools; start with openssl.pod
-ssl/
-        The SSL library; start with ssl.pod
-crypto/
-        The cryptographic library; start with crypto.pod
+
+man3/
+        The SSL library and the crypto library
+
+man5/
+        File formats
+
+man7/
+        Overviews; start with crypto.pod and ssl.pod, for example
 
 Formatted versions of the manpages (apps,ssl,crypto) can be found at
         https://www.openssl.org/docs/manpages.html
diff --git a/doc/apps/CA.pl.pod b/doc/man1/CA.pl.pod
similarity index 100%
rename from doc/apps/CA.pl.pod
rename to doc/man1/CA.pl.pod
diff --git a/doc/apps/asn1parse.pod b/doc/man1/asn1parse.pod
similarity index 100%
rename from doc/apps/asn1parse.pod
rename to doc/man1/asn1parse.pod
diff --git a/doc/apps/ca.pod b/doc/man1/ca.pod
similarity index 100%
rename from doc/apps/ca.pod
rename to doc/man1/ca.pod
diff --git a/doc/apps/ciphers.pod b/doc/man1/ciphers.pod
similarity index 100%
rename from doc/apps/ciphers.pod
rename to doc/man1/ciphers.pod
diff --git a/doc/apps/cms.pod b/doc/man1/cms.pod
similarity index 100%
rename from doc/apps/cms.pod
rename to doc/man1/cms.pod
diff --git a/doc/apps/crl.pod b/doc/man1/crl.pod
similarity index 100%
rename from doc/apps/crl.pod
rename to doc/man1/crl.pod
diff --git a/doc/apps/crl2pkcs7.pod b/doc/man1/crl2pkcs7.pod
similarity index 100%
rename from doc/apps/crl2pkcs7.pod
rename to doc/man1/crl2pkcs7.pod
diff --git a/doc/apps/dgst.pod b/doc/man1/dgst.pod
similarity index 100%
rename from doc/apps/dgst.pod
rename to doc/man1/dgst.pod
diff --git a/doc/apps/dhparam.pod b/doc/man1/dhparam.pod
similarity index 100%
rename from doc/apps/dhparam.pod
rename to doc/man1/dhparam.pod
diff --git a/doc/apps/dsa.pod b/doc/man1/dsa.pod
similarity index 100%
rename from doc/apps/dsa.pod
rename to doc/man1/dsa.pod
diff --git a/doc/apps/dsaparam.pod b/doc/man1/dsaparam.pod
similarity index 100%
rename from doc/apps/dsaparam.pod
rename to doc/man1/dsaparam.pod
diff --git a/doc/apps/ec.pod b/doc/man1/ec.pod
similarity index 100%
rename from doc/apps/ec.pod
rename to doc/man1/ec.pod
diff --git a/doc/apps/ecparam.pod b/doc/man1/ecparam.pod
similarity index 100%
rename from doc/apps/ecparam.pod
rename to doc/man1/ecparam.pod
diff --git a/doc/apps/enc.pod b/doc/man1/enc.pod
similarity index 100%
rename from doc/apps/enc.pod
rename to doc/man1/enc.pod
diff --git a/doc/apps/engine.pod b/doc/man1/engine.pod
similarity index 100%
rename from doc/apps/engine.pod
rename to doc/man1/engine.pod
diff --git a/doc/apps/errstr.pod b/doc/man1/errstr.pod
similarity index 100%
rename from doc/apps/errstr.pod
rename to doc/man1/errstr.pod
diff --git a/doc/apps/gendsa.pod b/doc/man1/gendsa.pod
similarity index 100%
rename from doc/apps/gendsa.pod
rename to doc/man1/gendsa.pod
diff --git a/doc/apps/genpkey.pod b/doc/man1/genpkey.pod
similarity index 100%
rename from doc/apps/genpkey.pod
rename to doc/man1/genpkey.pod
diff --git a/doc/apps/genrsa.pod b/doc/man1/genrsa.pod
similarity index 100%
rename from doc/apps/genrsa.pod
rename to doc/man1/genrsa.pod
diff --git a/doc/apps/list.pod b/doc/man1/list.pod
similarity index 100%
rename from doc/apps/list.pod
rename to doc/man1/list.pod
diff --git a/doc/apps/nseq.pod b/doc/man1/nseq.pod
similarity index 100%
rename from doc/apps/nseq.pod
rename to doc/man1/nseq.pod
diff --git a/doc/apps/ocsp.pod b/doc/man1/ocsp.pod
similarity index 100%
rename from doc/apps/ocsp.pod
rename to doc/man1/ocsp.pod
diff --git a/doc/apps/openssl.pod b/doc/man1/openssl.pod
similarity index 100%
rename from doc/apps/openssl.pod
rename to doc/man1/openssl.pod
diff --git a/doc/apps/passwd.pod b/doc/man1/passwd.pod
similarity index 100%
rename from doc/apps/passwd.pod
rename to doc/man1/passwd.pod
diff --git a/doc/apps/pkcs12.pod b/doc/man1/pkcs12.pod
similarity index 100%
rename from doc/apps/pkcs12.pod
rename to doc/man1/pkcs12.pod
diff --git a/doc/apps/pkcs7.pod b/doc/man1/pkcs7.pod
similarity index 100%
rename from doc/apps/pkcs7.pod
rename to doc/man1/pkcs7.pod
diff --git a/doc/apps/pkcs8.pod b/doc/man1/pkcs8.pod
similarity index 100%
rename from doc/apps/pkcs8.pod
rename to doc/man1/pkcs8.pod
diff --git a/doc/apps/pkey.pod b/doc/man1/pkey.pod
similarity index 100%
rename from doc/apps/pkey.pod
rename to doc/man1/pkey.pod
diff --git a/doc/apps/pkeyparam.pod b/doc/man1/pkeyparam.pod
similarity index 100%
rename from doc/apps/pkeyparam.pod
rename to doc/man1/pkeyparam.pod
diff --git a/doc/apps/pkeyutl.pod b/doc/man1/pkeyutl.pod
similarity index 100%
rename from doc/apps/pkeyutl.pod
rename to doc/man1/pkeyutl.pod
diff --git a/doc/apps/rand.pod b/doc/man1/rand.pod
similarity index 100%
rename from doc/apps/rand.pod
rename to doc/man1/rand.pod
diff --git a/doc/apps/rehash.pod b/doc/man1/rehash.pod
similarity index 100%
rename from doc/apps/rehash.pod
rename to doc/man1/rehash.pod
diff --git a/doc/apps/req.pod b/doc/man1/req.pod
similarity index 100%
rename from doc/apps/req.pod
rename to doc/man1/req.pod
diff --git a/doc/apps/rsa.pod b/doc/man1/rsa.pod
similarity index 100%
rename from doc/apps/rsa.pod
rename to doc/man1/rsa.pod
diff --git a/doc/apps/rsautl.pod b/doc/man1/rsautl.pod
similarity index 100%
rename from doc/apps/rsautl.pod
rename to doc/man1/rsautl.pod
diff --git a/doc/apps/s_client.pod b/doc/man1/s_client.pod
similarity index 100%
rename from doc/apps/s_client.pod
rename to doc/man1/s_client.pod
diff --git a/doc/apps/s_server.pod b/doc/man1/s_server.pod
similarity index 100%
rename from doc/apps/s_server.pod
rename to doc/man1/s_server.pod
diff --git a/doc/apps/s_time.pod b/doc/man1/s_time.pod
similarity index 100%
rename from doc/apps/s_time.pod
rename to doc/man1/s_time.pod
diff --git a/doc/apps/sess_id.pod b/doc/man1/sess_id.pod
similarity index 100%
rename from doc/apps/sess_id.pod
rename to doc/man1/sess_id.pod
diff --git a/doc/apps/smime.pod b/doc/man1/smime.pod
similarity index 100%
rename from doc/apps/smime.pod
rename to doc/man1/smime.pod
diff --git a/doc/apps/speed.pod b/doc/man1/speed.pod
similarity index 100%
rename from doc/apps/speed.pod
rename to doc/man1/speed.pod
diff --git a/doc/apps/spkac.pod b/doc/man1/spkac.pod
similarity index 100%
rename from doc/apps/spkac.pod
rename to doc/man1/spkac.pod
diff --git a/doc/apps/ts.pod b/doc/man1/ts.pod
similarity index 100%
rename from doc/apps/ts.pod
rename to doc/man1/ts.pod
diff --git a/doc/apps/tsget.pod b/doc/man1/tsget.pod
similarity index 100%
rename from doc/apps/tsget.pod
rename to doc/man1/tsget.pod
diff --git a/doc/apps/verify.pod b/doc/man1/verify.pod
similarity index 100%
rename from doc/apps/verify.pod
rename to doc/man1/verify.pod
diff --git a/doc/apps/version.pod b/doc/man1/version.pod
similarity index 100%
rename from doc/apps/version.pod
rename to doc/man1/version.pod
diff --git a/doc/apps/x509.pod b/doc/man1/x509.pod
similarity index 100%
rename from doc/apps/x509.pod
rename to doc/man1/x509.pod
diff --git a/doc/crypto/ASN1_INTEGER_get_int64.pod b/doc/man3/ASN1_INTEGER_get_int64.pod
similarity index 100%
rename from doc/crypto/ASN1_INTEGER_get_int64.pod
rename to doc/man3/ASN1_INTEGER_get_int64.pod
diff --git a/doc/crypto/ASN1_ITEM_lookup.pod b/doc/man3/ASN1_ITEM_lookup.pod
similarity index 100%
rename from doc/crypto/ASN1_ITEM_lookup.pod
rename to doc/man3/ASN1_ITEM_lookup.pod
diff --git a/doc/crypto/ASN1_OBJECT_new.pod b/doc/man3/ASN1_OBJECT_new.pod
similarity index 100%
rename from doc/crypto/ASN1_OBJECT_new.pod
rename to doc/man3/ASN1_OBJECT_new.pod
diff --git a/doc/crypto/ASN1_STRING_length.pod b/doc/man3/ASN1_STRING_length.pod
similarity index 100%
rename from doc/crypto/ASN1_STRING_length.pod
rename to doc/man3/ASN1_STRING_length.pod
diff --git a/doc/crypto/ASN1_STRING_new.pod b/doc/man3/ASN1_STRING_new.pod
similarity index 100%
rename from doc/crypto/ASN1_STRING_new.pod
rename to doc/man3/ASN1_STRING_new.pod
diff --git a/doc/crypto/ASN1_STRING_print_ex.pod b/doc/man3/ASN1_STRING_print_ex.pod
similarity index 100%
rename from doc/crypto/ASN1_STRING_print_ex.pod
rename to doc/man3/ASN1_STRING_print_ex.pod
diff --git a/doc/crypto/ASN1_TIME_set.pod b/doc/man3/ASN1_TIME_set.pod
similarity index 100%
rename from doc/crypto/ASN1_TIME_set.pod
rename to doc/man3/ASN1_TIME_set.pod
diff --git a/doc/crypto/ASN1_TYPE_get.pod b/doc/man3/ASN1_TYPE_get.pod
similarity index 100%
rename from doc/crypto/ASN1_TYPE_get.pod
rename to doc/man3/ASN1_TYPE_get.pod
diff --git a/doc/crypto/ASN1_generate_nconf.pod b/doc/man3/ASN1_generate_nconf.pod
similarity index 100%
rename from doc/crypto/ASN1_generate_nconf.pod
rename to doc/man3/ASN1_generate_nconf.pod
diff --git a/doc/crypto/ASYNC_WAIT_CTX_new.pod b/doc/man3/ASYNC_WAIT_CTX_new.pod
similarity index 100%
rename from doc/crypto/ASYNC_WAIT_CTX_new.pod
rename to doc/man3/ASYNC_WAIT_CTX_new.pod
diff --git a/doc/crypto/ASYNC_start_job.pod b/doc/man3/ASYNC_start_job.pod
similarity index 100%
rename from doc/crypto/ASYNC_start_job.pod
rename to doc/man3/ASYNC_start_job.pod
diff --git a/doc/crypto/BF_encrypt.pod b/doc/man3/BF_encrypt.pod
similarity index 100%
rename from doc/crypto/BF_encrypt.pod
rename to doc/man3/BF_encrypt.pod
diff --git a/doc/crypto/BIO_ADDR.pod b/doc/man3/BIO_ADDR.pod
similarity index 100%
rename from doc/crypto/BIO_ADDR.pod
rename to doc/man3/BIO_ADDR.pod
diff --git a/doc/crypto/BIO_ADDRINFO.pod b/doc/man3/BIO_ADDRINFO.pod
similarity index 100%
rename from doc/crypto/BIO_ADDRINFO.pod
rename to doc/man3/BIO_ADDRINFO.pod
diff --git a/doc/crypto/BIO_connect.pod b/doc/man3/BIO_connect.pod
similarity index 100%
rename from doc/crypto/BIO_connect.pod
rename to doc/man3/BIO_connect.pod
diff --git a/doc/crypto/BIO_ctrl.pod b/doc/man3/BIO_ctrl.pod
similarity index 100%
rename from doc/crypto/BIO_ctrl.pod
rename to doc/man3/BIO_ctrl.pod
diff --git a/doc/crypto/BIO_f_base64.pod b/doc/man3/BIO_f_base64.pod
similarity index 100%
rename from doc/crypto/BIO_f_base64.pod
rename to doc/man3/BIO_f_base64.pod
diff --git a/doc/crypto/BIO_f_buffer.pod b/doc/man3/BIO_f_buffer.pod
similarity index 100%
rename from doc/crypto/BIO_f_buffer.pod
rename to doc/man3/BIO_f_buffer.pod
diff --git a/doc/crypto/BIO_f_cipher.pod b/doc/man3/BIO_f_cipher.pod
similarity index 100%
rename from doc/crypto/BIO_f_cipher.pod
rename to doc/man3/BIO_f_cipher.pod
diff --git a/doc/crypto/BIO_f_md.pod b/doc/man3/BIO_f_md.pod
similarity index 100%
rename from doc/crypto/BIO_f_md.pod
rename to doc/man3/BIO_f_md.pod
diff --git a/doc/crypto/BIO_f_null.pod b/doc/man3/BIO_f_null.pod
similarity index 100%
rename from doc/crypto/BIO_f_null.pod
rename to doc/man3/BIO_f_null.pod
diff --git a/doc/crypto/BIO_f_ssl.pod b/doc/man3/BIO_f_ssl.pod
similarity index 100%
rename from doc/crypto/BIO_f_ssl.pod
rename to doc/man3/BIO_f_ssl.pod
diff --git a/doc/crypto/BIO_find_type.pod b/doc/man3/BIO_find_type.pod
similarity index 100%
rename from doc/crypto/BIO_find_type.pod
rename to doc/man3/BIO_find_type.pod
diff --git a/doc/crypto/BIO_get_data.pod b/doc/man3/BIO_get_data.pod
similarity index 100%
rename from doc/crypto/BIO_get_data.pod
rename to doc/man3/BIO_get_data.pod
diff --git a/doc/crypto/BIO_get_ex_new_index.pod b/doc/man3/BIO_get_ex_new_index.pod
similarity index 100%
rename from doc/crypto/BIO_get_ex_new_index.pod
rename to doc/man3/BIO_get_ex_new_index.pod
diff --git a/doc/crypto/BIO_meth_new.pod b/doc/man3/BIO_meth_new.pod
similarity index 100%
rename from doc/crypto/BIO_meth_new.pod
rename to doc/man3/BIO_meth_new.pod
diff --git a/doc/crypto/BIO_new.pod b/doc/man3/BIO_new.pod
similarity index 100%
rename from doc/crypto/BIO_new.pod
rename to doc/man3/BIO_new.pod
diff --git a/doc/crypto/BIO_new_CMS.pod b/doc/man3/BIO_new_CMS.pod
similarity index 100%
rename from doc/crypto/BIO_new_CMS.pod
rename to doc/man3/BIO_new_CMS.pod
diff --git a/doc/crypto/BIO_parse_hostserv.pod b/doc/man3/BIO_parse_hostserv.pod
similarity index 100%
rename from doc/crypto/BIO_parse_hostserv.pod
rename to doc/man3/BIO_parse_hostserv.pod
diff --git a/doc/crypto/BIO_push.pod b/doc/man3/BIO_push.pod
similarity index 100%
rename from doc/crypto/BIO_push.pod
rename to doc/man3/BIO_push.pod
diff --git a/doc/crypto/BIO_read.pod b/doc/man3/BIO_read.pod
similarity index 100%
rename from doc/crypto/BIO_read.pod
rename to doc/man3/BIO_read.pod
diff --git a/doc/crypto/BIO_s_accept.pod b/doc/man3/BIO_s_accept.pod
similarity index 100%
rename from doc/crypto/BIO_s_accept.pod
rename to doc/man3/BIO_s_accept.pod
diff --git a/doc/crypto/BIO_s_bio.pod b/doc/man3/BIO_s_bio.pod
similarity index 100%
rename from doc/crypto/BIO_s_bio.pod
rename to doc/man3/BIO_s_bio.pod
diff --git a/doc/crypto/BIO_s_connect.pod b/doc/man3/BIO_s_connect.pod
similarity index 100%
rename from doc/crypto/BIO_s_connect.pod
rename to doc/man3/BIO_s_connect.pod
diff --git a/doc/crypto/BIO_s_fd.pod b/doc/man3/BIO_s_fd.pod
similarity index 100%
rename from doc/crypto/BIO_s_fd.pod
rename to doc/man3/BIO_s_fd.pod
diff --git a/doc/crypto/BIO_s_file.pod b/doc/man3/BIO_s_file.pod
similarity index 100%
rename from doc/crypto/BIO_s_file.pod
rename to doc/man3/BIO_s_file.pod
diff --git a/doc/crypto/BIO_s_mem.pod b/doc/man3/BIO_s_mem.pod
similarity index 100%
rename from doc/crypto/BIO_s_mem.pod
rename to doc/man3/BIO_s_mem.pod
diff --git a/doc/crypto/BIO_s_null.pod b/doc/man3/BIO_s_null.pod
similarity index 100%
rename from doc/crypto/BIO_s_null.pod
rename to doc/man3/BIO_s_null.pod
diff --git a/doc/crypto/BIO_s_socket.pod b/doc/man3/BIO_s_socket.pod
similarity index 100%
rename from doc/crypto/BIO_s_socket.pod
rename to doc/man3/BIO_s_socket.pod
diff --git a/doc/crypto/BIO_set_callback.pod b/doc/man3/BIO_set_callback.pod
similarity index 100%
rename from doc/crypto/BIO_set_callback.pod
rename to doc/man3/BIO_set_callback.pod
diff --git a/doc/crypto/BIO_should_retry.pod b/doc/man3/BIO_should_retry.pod
similarity index 100%
rename from doc/crypto/BIO_should_retry.pod
rename to doc/man3/BIO_should_retry.pod
diff --git a/doc/crypto/BN_BLINDING_new.pod b/doc/man3/BN_BLINDING_new.pod
similarity index 100%
rename from doc/crypto/BN_BLINDING_new.pod
rename to doc/man3/BN_BLINDING_new.pod
diff --git a/doc/crypto/BN_CTX_new.pod b/doc/man3/BN_CTX_new.pod
similarity index 100%
rename from doc/crypto/BN_CTX_new.pod
rename to doc/man3/BN_CTX_new.pod
diff --git a/doc/crypto/BN_CTX_start.pod b/doc/man3/BN_CTX_start.pod
similarity index 100%
rename from doc/crypto/BN_CTX_start.pod
rename to doc/man3/BN_CTX_start.pod
diff --git a/doc/crypto/BN_add.pod b/doc/man3/BN_add.pod
similarity index 100%
rename from doc/crypto/BN_add.pod
rename to doc/man3/BN_add.pod
diff --git a/doc/crypto/BN_add_word.pod b/doc/man3/BN_add_word.pod
similarity index 100%
rename from doc/crypto/BN_add_word.pod
rename to doc/man3/BN_add_word.pod
diff --git a/doc/crypto/BN_bn2bin.pod b/doc/man3/BN_bn2bin.pod
similarity index 100%
rename from doc/crypto/BN_bn2bin.pod
rename to doc/man3/BN_bn2bin.pod
diff --git a/doc/crypto/BN_cmp.pod b/doc/man3/BN_cmp.pod
similarity index 100%
rename from doc/crypto/BN_cmp.pod
rename to doc/man3/BN_cmp.pod
diff --git a/doc/crypto/BN_copy.pod b/doc/man3/BN_copy.pod
similarity index 100%
rename from doc/crypto/BN_copy.pod
rename to doc/man3/BN_copy.pod
diff --git a/doc/crypto/BN_generate_prime.pod b/doc/man3/BN_generate_prime.pod
similarity index 100%
rename from doc/crypto/BN_generate_prime.pod
rename to doc/man3/BN_generate_prime.pod
diff --git a/doc/crypto/BN_mod_inverse.pod b/doc/man3/BN_mod_inverse.pod
similarity index 100%
rename from doc/crypto/BN_mod_inverse.pod
rename to doc/man3/BN_mod_inverse.pod
diff --git a/doc/crypto/BN_mod_mul_montgomery.pod b/doc/man3/BN_mod_mul_montgomery.pod
similarity index 100%
rename from doc/crypto/BN_mod_mul_montgomery.pod
rename to doc/man3/BN_mod_mul_montgomery.pod
diff --git a/doc/crypto/BN_mod_mul_reciprocal.pod b/doc/man3/BN_mod_mul_reciprocal.pod
similarity index 100%
rename from doc/crypto/BN_mod_mul_reciprocal.pod
rename to doc/man3/BN_mod_mul_reciprocal.pod
diff --git a/doc/crypto/BN_new.pod b/doc/man3/BN_new.pod
similarity index 100%
rename from doc/crypto/BN_new.pod
rename to doc/man3/BN_new.pod
diff --git a/doc/crypto/BN_num_bytes.pod b/doc/man3/BN_num_bytes.pod
similarity index 100%
rename from doc/crypto/BN_num_bytes.pod
rename to doc/man3/BN_num_bytes.pod
diff --git a/doc/crypto/BN_rand.pod b/doc/man3/BN_rand.pod
similarity index 100%
rename from doc/crypto/BN_rand.pod
rename to doc/man3/BN_rand.pod
diff --git a/doc/crypto/BN_set_bit.pod b/doc/man3/BN_set_bit.pod
similarity index 100%
rename from doc/crypto/BN_set_bit.pod
rename to doc/man3/BN_set_bit.pod
diff --git a/doc/crypto/BN_swap.pod b/doc/man3/BN_swap.pod
similarity index 100%
rename from doc/crypto/BN_swap.pod
rename to doc/man3/BN_swap.pod
diff --git a/doc/crypto/BN_zero.pod b/doc/man3/BN_zero.pod
similarity index 100%
rename from doc/crypto/BN_zero.pod
rename to doc/man3/BN_zero.pod
diff --git a/doc/crypto/BUF_MEM_new.pod b/doc/man3/BUF_MEM_new.pod
similarity index 100%
rename from doc/crypto/BUF_MEM_new.pod
rename to doc/man3/BUF_MEM_new.pod
diff --git a/doc/crypto/CMS_add0_cert.pod b/doc/man3/CMS_add0_cert.pod
similarity index 100%
rename from doc/crypto/CMS_add0_cert.pod
rename to doc/man3/CMS_add0_cert.pod
diff --git a/doc/crypto/CMS_add1_recipient_cert.pod b/doc/man3/CMS_add1_recipient_cert.pod
similarity index 100%
rename from doc/crypto/CMS_add1_recipient_cert.pod
rename to doc/man3/CMS_add1_recipient_cert.pod
diff --git a/doc/crypto/CMS_add1_signer.pod b/doc/man3/CMS_add1_signer.pod
similarity index 100%
rename from doc/crypto/CMS_add1_signer.pod
rename to doc/man3/CMS_add1_signer.pod
diff --git a/doc/crypto/CMS_compress.pod b/doc/man3/CMS_compress.pod
similarity index 100%
rename from doc/crypto/CMS_compress.pod
rename to doc/man3/CMS_compress.pod
diff --git a/doc/crypto/CMS_decrypt.pod b/doc/man3/CMS_decrypt.pod
similarity index 100%
rename from doc/crypto/CMS_decrypt.pod
rename to doc/man3/CMS_decrypt.pod
diff --git a/doc/crypto/CMS_encrypt.pod b/doc/man3/CMS_encrypt.pod
similarity index 100%
rename from doc/crypto/CMS_encrypt.pod
rename to doc/man3/CMS_encrypt.pod
diff --git a/doc/crypto/CMS_final.pod b/doc/man3/CMS_final.pod
similarity index 100%
rename from doc/crypto/CMS_final.pod
rename to doc/man3/CMS_final.pod
diff --git a/doc/crypto/CMS_get0_RecipientInfos.pod b/doc/man3/CMS_get0_RecipientInfos.pod
similarity index 100%
rename from doc/crypto/CMS_get0_RecipientInfos.pod
rename to doc/man3/CMS_get0_RecipientInfos.pod
diff --git a/doc/crypto/CMS_get0_SignerInfos.pod b/doc/man3/CMS_get0_SignerInfos.pod
similarity index 100%
rename from doc/crypto/CMS_get0_SignerInfos.pod
rename to doc/man3/CMS_get0_SignerInfos.pod
diff --git a/doc/crypto/CMS_get0_type.pod b/doc/man3/CMS_get0_type.pod
similarity index 100%
rename from doc/crypto/CMS_get0_type.pod
rename to doc/man3/CMS_get0_type.pod
diff --git a/doc/crypto/CMS_get1_ReceiptRequest.pod b/doc/man3/CMS_get1_ReceiptRequest.pod
similarity index 100%
rename from doc/crypto/CMS_get1_ReceiptRequest.pod
rename to doc/man3/CMS_get1_ReceiptRequest.pod
diff --git a/doc/crypto/CMS_sign.pod b/doc/man3/CMS_sign.pod
similarity index 100%
rename from doc/crypto/CMS_sign.pod
rename to doc/man3/CMS_sign.pod
diff --git a/doc/crypto/CMS_sign_receipt.pod b/doc/man3/CMS_sign_receipt.pod
similarity index 100%
rename from doc/crypto/CMS_sign_receipt.pod
rename to doc/man3/CMS_sign_receipt.pod
diff --git a/doc/crypto/CMS_uncompress.pod b/doc/man3/CMS_uncompress.pod
similarity index 100%
rename from doc/crypto/CMS_uncompress.pod
rename to doc/man3/CMS_uncompress.pod
diff --git a/doc/crypto/CMS_verify.pod b/doc/man3/CMS_verify.pod
similarity index 100%
rename from doc/crypto/CMS_verify.pod
rename to doc/man3/CMS_verify.pod
diff --git a/doc/crypto/CMS_verify_receipt.pod b/doc/man3/CMS_verify_receipt.pod
similarity index 100%
rename from doc/crypto/CMS_verify_receipt.pod
rename to doc/man3/CMS_verify_receipt.pod
diff --git a/doc/crypto/CONF_modules_free.pod b/doc/man3/CONF_modules_free.pod
similarity index 100%
rename from doc/crypto/CONF_modules_free.pod
rename to doc/man3/CONF_modules_free.pod
diff --git a/doc/crypto/CONF_modules_load_file.pod b/doc/man3/CONF_modules_load_file.pod
similarity index 100%
rename from doc/crypto/CONF_modules_load_file.pod
rename to doc/man3/CONF_modules_load_file.pod
diff --git a/doc/crypto/CRYPTO_THREAD_run_once.pod b/doc/man3/CRYPTO_THREAD_run_once.pod
similarity index 100%
rename from doc/crypto/CRYPTO_THREAD_run_once.pod
rename to doc/man3/CRYPTO_THREAD_run_once.pod
diff --git a/doc/crypto/CRYPTO_get_ex_new_index.pod b/doc/man3/CRYPTO_get_ex_new_index.pod
similarity index 100%
rename from doc/crypto/CRYPTO_get_ex_new_index.pod
rename to doc/man3/CRYPTO_get_ex_new_index.pod
diff --git a/doc/crypto/CTLOG_STORE_get0_log_by_id.pod b/doc/man3/CTLOG_STORE_get0_log_by_id.pod
similarity index 100%
rename from doc/crypto/CTLOG_STORE_get0_log_by_id.pod
rename to doc/man3/CTLOG_STORE_get0_log_by_id.pod
diff --git a/doc/crypto/CTLOG_STORE_new.pod b/doc/man3/CTLOG_STORE_new.pod
similarity index 100%
rename from doc/crypto/CTLOG_STORE_new.pod
rename to doc/man3/CTLOG_STORE_new.pod
diff --git a/doc/crypto/CTLOG_new.pod b/doc/man3/CTLOG_new.pod
similarity index 100%
rename from doc/crypto/CTLOG_new.pod
rename to doc/man3/CTLOG_new.pod
diff --git a/doc/crypto/CT_POLICY_EVAL_CTX_new.pod b/doc/man3/CT_POLICY_EVAL_CTX_new.pod
similarity index 100%
rename from doc/crypto/CT_POLICY_EVAL_CTX_new.pod
rename to doc/man3/CT_POLICY_EVAL_CTX_new.pod
diff --git a/doc/crypto/DEFINE_STACK_OF.pod b/doc/man3/DEFINE_STACK_OF.pod
similarity index 100%
rename from doc/crypto/DEFINE_STACK_OF.pod
rename to doc/man3/DEFINE_STACK_OF.pod
diff --git a/doc/crypto/DES_random_key.pod b/doc/man3/DES_random_key.pod
similarity index 100%
rename from doc/crypto/DES_random_key.pod
rename to doc/man3/DES_random_key.pod
diff --git a/doc/crypto/DH_generate_key.pod b/doc/man3/DH_generate_key.pod
similarity index 100%
rename from doc/crypto/DH_generate_key.pod
rename to doc/man3/DH_generate_key.pod
diff --git a/doc/crypto/DH_generate_parameters.pod b/doc/man3/DH_generate_parameters.pod
similarity index 100%
rename from doc/crypto/DH_generate_parameters.pod
rename to doc/man3/DH_generate_parameters.pod
diff --git a/doc/crypto/DH_get0_pqg.pod b/doc/man3/DH_get0_pqg.pod
similarity index 100%
rename from doc/crypto/DH_get0_pqg.pod
rename to doc/man3/DH_get0_pqg.pod
diff --git a/doc/crypto/DH_get_1024_160.pod b/doc/man3/DH_get_1024_160.pod
similarity index 100%
rename from doc/crypto/DH_get_1024_160.pod
rename to doc/man3/DH_get_1024_160.pod
diff --git a/doc/crypto/DH_meth_new.pod b/doc/man3/DH_meth_new.pod
similarity index 100%
rename from doc/crypto/DH_meth_new.pod
rename to doc/man3/DH_meth_new.pod
diff --git a/doc/crypto/DH_new.pod b/doc/man3/DH_new.pod
similarity index 100%
rename from doc/crypto/DH_new.pod
rename to doc/man3/DH_new.pod
diff --git a/doc/crypto/DH_set_method.pod b/doc/man3/DH_set_method.pod
similarity index 100%
rename from doc/crypto/DH_set_method.pod
rename to doc/man3/DH_set_method.pod
diff --git a/doc/crypto/DH_size.pod b/doc/man3/DH_size.pod
similarity index 100%
rename from doc/crypto/DH_size.pod
rename to doc/man3/DH_size.pod
diff --git a/doc/crypto/DSA_SIG_new.pod b/doc/man3/DSA_SIG_new.pod
similarity index 100%
rename from doc/crypto/DSA_SIG_new.pod
rename to doc/man3/DSA_SIG_new.pod
diff --git a/doc/crypto/DSA_do_sign.pod b/doc/man3/DSA_do_sign.pod
similarity index 100%
rename from doc/crypto/DSA_do_sign.pod
rename to doc/man3/DSA_do_sign.pod
diff --git a/doc/crypto/DSA_dup_DH.pod b/doc/man3/DSA_dup_DH.pod
similarity index 100%
rename from doc/crypto/DSA_dup_DH.pod
rename to doc/man3/DSA_dup_DH.pod
diff --git a/doc/crypto/DSA_generate_key.pod b/doc/man3/DSA_generate_key.pod
similarity index 100%
rename from doc/crypto/DSA_generate_key.pod
rename to doc/man3/DSA_generate_key.pod
diff --git a/doc/crypto/DSA_generate_parameters.pod b/doc/man3/DSA_generate_parameters.pod
similarity index 100%
rename from doc/crypto/DSA_generate_parameters.pod
rename to doc/man3/DSA_generate_parameters.pod
diff --git a/doc/crypto/DSA_get0_pqg.pod b/doc/man3/DSA_get0_pqg.pod
similarity index 100%
rename from doc/crypto/DSA_get0_pqg.pod
rename to doc/man3/DSA_get0_pqg.pod
diff --git a/doc/crypto/DSA_meth_new.pod b/doc/man3/DSA_meth_new.pod
similarity index 100%
rename from doc/crypto/DSA_meth_new.pod
rename to doc/man3/DSA_meth_new.pod
diff --git a/doc/crypto/DSA_new.pod b/doc/man3/DSA_new.pod
similarity index 100%
rename from doc/crypto/DSA_new.pod
rename to doc/man3/DSA_new.pod
diff --git a/doc/crypto/DSA_set_method.pod b/doc/man3/DSA_set_method.pod
similarity index 100%
rename from doc/crypto/DSA_set_method.pod
rename to doc/man3/DSA_set_method.pod
diff --git a/doc/crypto/DSA_sign.pod b/doc/man3/DSA_sign.pod
similarity index 100%
rename from doc/crypto/DSA_sign.pod
rename to doc/man3/DSA_sign.pod
diff --git a/doc/crypto/DSA_size.pod b/doc/man3/DSA_size.pod
similarity index 100%
rename from doc/crypto/DSA_size.pod
rename to doc/man3/DSA_size.pod
diff --git a/doc/ssl/DTLSv1_listen.pod b/doc/man3/DTLSv1_listen.pod
similarity index 100%
rename from doc/ssl/DTLSv1_listen.pod
rename to doc/man3/DTLSv1_listen.pod
diff --git a/doc/crypto/ECDSA_SIG_new.pod b/doc/man3/ECDSA_SIG_new.pod
similarity index 100%
rename from doc/crypto/ECDSA_SIG_new.pod
rename to doc/man3/ECDSA_SIG_new.pod
diff --git a/doc/crypto/ECPKParameters_print.pod b/doc/man3/ECPKParameters_print.pod
similarity index 100%
rename from doc/crypto/ECPKParameters_print.pod
rename to doc/man3/ECPKParameters_print.pod
diff --git a/doc/crypto/EC_GFp_simple_method.pod b/doc/man3/EC_GFp_simple_method.pod
similarity index 100%
rename from doc/crypto/EC_GFp_simple_method.pod
rename to doc/man3/EC_GFp_simple_method.pod
diff --git a/doc/crypto/EC_GROUP_copy.pod b/doc/man3/EC_GROUP_copy.pod
similarity index 100%
rename from doc/crypto/EC_GROUP_copy.pod
rename to doc/man3/EC_GROUP_copy.pod
diff --git a/doc/crypto/EC_GROUP_new.pod b/doc/man3/EC_GROUP_new.pod
similarity index 100%
rename from doc/crypto/EC_GROUP_new.pod
rename to doc/man3/EC_GROUP_new.pod
diff --git a/doc/crypto/EC_KEY_get_enc_flags.pod b/doc/man3/EC_KEY_get_enc_flags.pod
similarity index 100%
rename from doc/crypto/EC_KEY_get_enc_flags.pod
rename to doc/man3/EC_KEY_get_enc_flags.pod
diff --git a/doc/crypto/EC_KEY_new.pod b/doc/man3/EC_KEY_new.pod
similarity index 100%
rename from doc/crypto/EC_KEY_new.pod
rename to doc/man3/EC_KEY_new.pod
diff --git a/doc/crypto/EC_POINT_add.pod b/doc/man3/EC_POINT_add.pod
similarity index 100%
rename from doc/crypto/EC_POINT_add.pod
rename to doc/man3/EC_POINT_add.pod
diff --git a/doc/crypto/EC_POINT_new.pod b/doc/man3/EC_POINT_new.pod
similarity index 100%
rename from doc/crypto/EC_POINT_new.pod
rename to doc/man3/EC_POINT_new.pod
diff --git a/doc/crypto/ENGINE_add.pod b/doc/man3/ENGINE_add.pod
similarity index 100%
rename from doc/crypto/ENGINE_add.pod
rename to doc/man3/ENGINE_add.pod
diff --git a/doc/crypto/ERR_GET_LIB.pod b/doc/man3/ERR_GET_LIB.pod
similarity index 100%
rename from doc/crypto/ERR_GET_LIB.pod
rename to doc/man3/ERR_GET_LIB.pod
diff --git a/doc/crypto/ERR_clear_error.pod b/doc/man3/ERR_clear_error.pod
similarity index 100%
rename from doc/crypto/ERR_clear_error.pod
rename to doc/man3/ERR_clear_error.pod
diff --git a/doc/crypto/ERR_error_string.pod b/doc/man3/ERR_error_string.pod
similarity index 100%
rename from doc/crypto/ERR_error_string.pod
rename to doc/man3/ERR_error_string.pod
diff --git a/doc/crypto/ERR_get_error.pod b/doc/man3/ERR_get_error.pod
similarity index 100%
rename from doc/crypto/ERR_get_error.pod
rename to doc/man3/ERR_get_error.pod
diff --git a/doc/crypto/ERR_load_crypto_strings.pod b/doc/man3/ERR_load_crypto_strings.pod
similarity index 100%
rename from doc/crypto/ERR_load_crypto_strings.pod
rename to doc/man3/ERR_load_crypto_strings.pod
diff --git a/doc/crypto/ERR_load_strings.pod b/doc/man3/ERR_load_strings.pod
similarity index 100%
rename from doc/crypto/ERR_load_strings.pod
rename to doc/man3/ERR_load_strings.pod
diff --git a/doc/crypto/ERR_print_errors.pod b/doc/man3/ERR_print_errors.pod
similarity index 100%
rename from doc/crypto/ERR_print_errors.pod
rename to doc/man3/ERR_print_errors.pod
diff --git a/doc/crypto/ERR_put_error.pod b/doc/man3/ERR_put_error.pod
similarity index 100%
rename from doc/crypto/ERR_put_error.pod
rename to doc/man3/ERR_put_error.pod
diff --git a/doc/crypto/ERR_remove_state.pod b/doc/man3/ERR_remove_state.pod
similarity index 100%
rename from doc/crypto/ERR_remove_state.pod
rename to doc/man3/ERR_remove_state.pod
diff --git a/doc/crypto/ERR_set_mark.pod b/doc/man3/ERR_set_mark.pod
similarity index 100%
rename from doc/crypto/ERR_set_mark.pod
rename to doc/man3/ERR_set_mark.pod
diff --git a/doc/crypto/EVP_BytesToKey.pod b/doc/man3/EVP_BytesToKey.pod
similarity index 100%
rename from doc/crypto/EVP_BytesToKey.pod
rename to doc/man3/EVP_BytesToKey.pod
diff --git a/doc/crypto/EVP_CIPHER_CTX_get_cipher_data.pod b/doc/man3/EVP_CIPHER_CTX_get_cipher_data.pod
similarity index 100%
rename from doc/crypto/EVP_CIPHER_CTX_get_cipher_data.pod
rename to doc/man3/EVP_CIPHER_CTX_get_cipher_data.pod
diff --git a/doc/crypto/EVP_CIPHER_meth_new.pod b/doc/man3/EVP_CIPHER_meth_new.pod
similarity index 100%
rename from doc/crypto/EVP_CIPHER_meth_new.pod
rename to doc/man3/EVP_CIPHER_meth_new.pod
diff --git a/doc/crypto/EVP_DigestInit.pod b/doc/man3/EVP_DigestInit.pod
similarity index 100%
rename from doc/crypto/EVP_DigestInit.pod
rename to doc/man3/EVP_DigestInit.pod
diff --git a/doc/crypto/EVP_DigestSignInit.pod b/doc/man3/EVP_DigestSignInit.pod
similarity index 100%
rename from doc/crypto/EVP_DigestSignInit.pod
rename to doc/man3/EVP_DigestSignInit.pod
diff --git a/doc/crypto/EVP_DigestVerifyInit.pod b/doc/man3/EVP_DigestVerifyInit.pod
similarity index 100%
rename from doc/crypto/EVP_DigestVerifyInit.pod
rename to doc/man3/EVP_DigestVerifyInit.pod
diff --git a/doc/crypto/EVP_EncodeInit.pod b/doc/man3/EVP_EncodeInit.pod
similarity index 100%
rename from doc/crypto/EVP_EncodeInit.pod
rename to doc/man3/EVP_EncodeInit.pod
diff --git a/doc/crypto/EVP_EncryptInit.pod b/doc/man3/EVP_EncryptInit.pod
similarity index 100%
rename from doc/crypto/EVP_EncryptInit.pod
rename to doc/man3/EVP_EncryptInit.pod
diff --git a/doc/crypto/EVP_MD_meth_new.pod b/doc/man3/EVP_MD_meth_new.pod
similarity index 100%
rename from doc/crypto/EVP_MD_meth_new.pod
rename to doc/man3/EVP_MD_meth_new.pod
diff --git a/doc/crypto/EVP_OpenInit.pod b/doc/man3/EVP_OpenInit.pod
similarity index 100%
rename from doc/crypto/EVP_OpenInit.pod
rename to doc/man3/EVP_OpenInit.pod
diff --git a/doc/crypto/EVP_PKEY_CTX_ctrl.pod b/doc/man3/EVP_PKEY_CTX_ctrl.pod
similarity index 100%
rename from doc/crypto/EVP_PKEY_CTX_ctrl.pod
rename to doc/man3/EVP_PKEY_CTX_ctrl.pod
diff --git a/doc/crypto/EVP_PKEY_CTX_new.pod b/doc/man3/EVP_PKEY_CTX_new.pod
similarity index 100%
rename from doc/crypto/EVP_PKEY_CTX_new.pod
rename to doc/man3/EVP_PKEY_CTX_new.pod
diff --git a/doc/crypto/EVP_PKEY_CTX_set_hkdf_md.pod b/doc/man3/EVP_PKEY_CTX_set_hkdf_md.pod
similarity index 100%
rename from doc/crypto/EVP_PKEY_CTX_set_hkdf_md.pod
rename to doc/man3/EVP_PKEY_CTX_set_hkdf_md.pod
diff --git a/doc/crypto/EVP_PKEY_CTX_set_tls1_prf_md.pod b/doc/man3/EVP_PKEY_CTX_set_tls1_prf_md.pod
similarity index 100%
rename from doc/crypto/EVP_PKEY_CTX_set_tls1_prf_md.pod
rename to doc/man3/EVP_PKEY_CTX_set_tls1_prf_md.pod
diff --git a/doc/crypto/EVP_PKEY_cmp.pod b/doc/man3/EVP_PKEY_cmp.pod
similarity index 100%
rename from doc/crypto/EVP_PKEY_cmp.pod
rename to doc/man3/EVP_PKEY_cmp.pod
diff --git a/doc/crypto/EVP_PKEY_decrypt.pod b/doc/man3/EVP_PKEY_decrypt.pod
similarity index 100%
rename from doc/crypto/EVP_PKEY_decrypt.pod
rename to doc/man3/EVP_PKEY_decrypt.pod
diff --git a/doc/crypto/EVP_PKEY_derive.pod b/doc/man3/EVP_PKEY_derive.pod
similarity index 100%
rename from doc/crypto/EVP_PKEY_derive.pod
rename to doc/man3/EVP_PKEY_derive.pod
diff --git a/doc/crypto/EVP_PKEY_encrypt.pod b/doc/man3/EVP_PKEY_encrypt.pod
similarity index 100%
rename from doc/crypto/EVP_PKEY_encrypt.pod
rename to doc/man3/EVP_PKEY_encrypt.pod
diff --git a/doc/crypto/EVP_PKEY_get_default_digest_nid.pod b/doc/man3/EVP_PKEY_get_default_digest_nid.pod
similarity index 100%
rename from doc/crypto/EVP_PKEY_get_default_digest_nid.pod
rename to doc/man3/EVP_PKEY_get_default_digest_nid.pod
diff --git a/doc/crypto/EVP_PKEY_keygen.pod b/doc/man3/EVP_PKEY_keygen.pod
similarity index 100%
rename from doc/crypto/EVP_PKEY_keygen.pod
rename to doc/man3/EVP_PKEY_keygen.pod
diff --git a/doc/crypto/EVP_PKEY_new.pod b/doc/man3/EVP_PKEY_new.pod
similarity index 100%
rename from doc/crypto/EVP_PKEY_new.pod
rename to doc/man3/EVP_PKEY_new.pod
diff --git a/doc/crypto/EVP_PKEY_print_private.pod b/doc/man3/EVP_PKEY_print_private.pod
similarity index 100%
rename from doc/crypto/EVP_PKEY_print_private.pod
rename to doc/man3/EVP_PKEY_print_private.pod
diff --git a/doc/crypto/EVP_PKEY_set1_RSA.pod b/doc/man3/EVP_PKEY_set1_RSA.pod
similarity index 100%
rename from doc/crypto/EVP_PKEY_set1_RSA.pod
rename to doc/man3/EVP_PKEY_set1_RSA.pod
diff --git a/doc/crypto/EVP_PKEY_sign.pod b/doc/man3/EVP_PKEY_sign.pod
similarity index 100%
rename from doc/crypto/EVP_PKEY_sign.pod
rename to doc/man3/EVP_PKEY_sign.pod
diff --git a/doc/crypto/EVP_PKEY_verify.pod b/doc/man3/EVP_PKEY_verify.pod
similarity index 100%
rename from doc/crypto/EVP_PKEY_verify.pod
rename to doc/man3/EVP_PKEY_verify.pod
diff --git a/doc/crypto/EVP_PKEY_verify_recover.pod b/doc/man3/EVP_PKEY_verify_recover.pod
similarity index 100%
rename from doc/crypto/EVP_PKEY_verify_recover.pod
rename to doc/man3/EVP_PKEY_verify_recover.pod
diff --git a/doc/crypto/EVP_SealInit.pod b/doc/man3/EVP_SealInit.pod
similarity index 100%
rename from doc/crypto/EVP_SealInit.pod
rename to doc/man3/EVP_SealInit.pod
diff --git a/doc/crypto/EVP_SignInit.pod b/doc/man3/EVP_SignInit.pod
similarity index 100%
rename from doc/crypto/EVP_SignInit.pod
rename to doc/man3/EVP_SignInit.pod
diff --git a/doc/crypto/EVP_VerifyInit.pod b/doc/man3/EVP_VerifyInit.pod
similarity index 100%
rename from doc/crypto/EVP_VerifyInit.pod
rename to doc/man3/EVP_VerifyInit.pod
diff --git a/doc/crypto/HMAC.pod b/doc/man3/HMAC.pod
similarity index 100%
rename from doc/crypto/HMAC.pod
rename to doc/man3/HMAC.pod
diff --git a/doc/crypto/MD5.pod b/doc/man3/MD5.pod
similarity index 100%
rename from doc/crypto/MD5.pod
rename to doc/man3/MD5.pod
diff --git a/doc/crypto/MDC2_Init.pod b/doc/man3/MDC2_Init.pod
similarity index 100%
rename from doc/crypto/MDC2_Init.pod
rename to doc/man3/MDC2_Init.pod
diff --git a/doc/crypto/OBJ_nid2obj.pod b/doc/man3/OBJ_nid2obj.pod
similarity index 100%
rename from doc/crypto/OBJ_nid2obj.pod
rename to doc/man3/OBJ_nid2obj.pod
diff --git a/doc/crypto/OCSP_REQUEST_new.pod b/doc/man3/OCSP_REQUEST_new.pod
similarity index 100%
rename from doc/crypto/OCSP_REQUEST_new.pod
rename to doc/man3/OCSP_REQUEST_new.pod
diff --git a/doc/crypto/OCSP_cert_to_id.pod b/doc/man3/OCSP_cert_to_id.pod
similarity index 100%
rename from doc/crypto/OCSP_cert_to_id.pod
rename to doc/man3/OCSP_cert_to_id.pod
diff --git a/doc/crypto/OCSP_request_add1_nonce.pod b/doc/man3/OCSP_request_add1_nonce.pod
similarity index 100%
rename from doc/crypto/OCSP_request_add1_nonce.pod
rename to doc/man3/OCSP_request_add1_nonce.pod
diff --git a/doc/crypto/OCSP_resp_find_status.pod b/doc/man3/OCSP_resp_find_status.pod
similarity index 100%
rename from doc/crypto/OCSP_resp_find_status.pod
rename to doc/man3/OCSP_resp_find_status.pod
diff --git a/doc/crypto/OCSP_response_status.pod b/doc/man3/OCSP_response_status.pod
similarity index 100%
rename from doc/crypto/OCSP_response_status.pod
rename to doc/man3/OCSP_response_status.pod
diff --git a/doc/crypto/OCSP_sendreq_new.pod b/doc/man3/OCSP_sendreq_new.pod
similarity index 100%
rename from doc/crypto/OCSP_sendreq_new.pod
rename to doc/man3/OCSP_sendreq_new.pod
diff --git a/doc/crypto/OPENSSL_Applink.pod b/doc/man3/OPENSSL_Applink.pod
similarity index 100%
rename from doc/crypto/OPENSSL_Applink.pod
rename to doc/man3/OPENSSL_Applink.pod
diff --git a/doc/crypto/OPENSSL_LH_COMPFUNC.pod b/doc/man3/OPENSSL_LH_COMPFUNC.pod
similarity index 100%
rename from doc/crypto/OPENSSL_LH_COMPFUNC.pod
rename to doc/man3/OPENSSL_LH_COMPFUNC.pod
diff --git a/doc/crypto/OPENSSL_LH_stats.pod b/doc/man3/OPENSSL_LH_stats.pod
similarity index 100%
rename from doc/crypto/OPENSSL_LH_stats.pod
rename to doc/man3/OPENSSL_LH_stats.pod
diff --git a/doc/crypto/OPENSSL_VERSION_NUMBER.pod b/doc/man3/OPENSSL_VERSION_NUMBER.pod
similarity index 100%
rename from doc/crypto/OPENSSL_VERSION_NUMBER.pod
rename to doc/man3/OPENSSL_VERSION_NUMBER.pod
diff --git a/doc/crypto/OPENSSL_config.pod b/doc/man3/OPENSSL_config.pod
similarity index 100%
rename from doc/crypto/OPENSSL_config.pod
rename to doc/man3/OPENSSL_config.pod
diff --git a/doc/crypto/OPENSSL_ia32cap.pod b/doc/man3/OPENSSL_ia32cap.pod
similarity index 100%
rename from doc/crypto/OPENSSL_ia32cap.pod
rename to doc/man3/OPENSSL_ia32cap.pod
diff --git a/doc/crypto/OPENSSL_init_crypto.pod b/doc/man3/OPENSSL_init_crypto.pod
similarity index 100%
rename from doc/crypto/OPENSSL_init_crypto.pod
rename to doc/man3/OPENSSL_init_crypto.pod
diff --git a/doc/ssl/OPENSSL_init_ssl.pod b/doc/man3/OPENSSL_init_ssl.pod
similarity index 100%
rename from doc/ssl/OPENSSL_init_ssl.pod
rename to doc/man3/OPENSSL_init_ssl.pod
diff --git a/doc/crypto/OPENSSL_instrument_bus.pod b/doc/man3/OPENSSL_instrument_bus.pod
similarity index 100%
rename from doc/crypto/OPENSSL_instrument_bus.pod
rename to doc/man3/OPENSSL_instrument_bus.pod
diff --git a/doc/crypto/OPENSSL_load_builtin_modules.pod b/doc/man3/OPENSSL_load_builtin_modules.pod
similarity index 100%
rename from doc/crypto/OPENSSL_load_builtin_modules.pod
rename to doc/man3/OPENSSL_load_builtin_modules.pod
diff --git a/doc/crypto/OPENSSL_malloc.pod b/doc/man3/OPENSSL_malloc.pod
similarity index 100%
rename from doc/crypto/OPENSSL_malloc.pod
rename to doc/man3/OPENSSL_malloc.pod
diff --git a/doc/crypto/OPENSSL_secure_malloc.pod b/doc/man3/OPENSSL_secure_malloc.pod
similarity index 100%
rename from doc/crypto/OPENSSL_secure_malloc.pod
rename to doc/man3/OPENSSL_secure_malloc.pod
diff --git a/doc/crypto/OpenSSL_add_all_algorithms.pod b/doc/man3/OpenSSL_add_all_algorithms.pod
similarity index 100%
rename from doc/crypto/OpenSSL_add_all_algorithms.pod
rename to doc/man3/OpenSSL_add_all_algorithms.pod
diff --git a/doc/crypto/PEM_read.pod b/doc/man3/PEM_read.pod
similarity index 100%
rename from doc/crypto/PEM_read.pod
rename to doc/man3/PEM_read.pod
diff --git a/doc/crypto/PEM_read_CMS.pod b/doc/man3/PEM_read_CMS.pod
similarity index 100%
rename from doc/crypto/PEM_read_CMS.pod
rename to doc/man3/PEM_read_CMS.pod
diff --git a/doc/crypto/PEM_read_bio_PrivateKey.pod b/doc/man3/PEM_read_bio_PrivateKey.pod
similarity index 100%
rename from doc/crypto/PEM_read_bio_PrivateKey.pod
rename to doc/man3/PEM_read_bio_PrivateKey.pod
diff --git a/doc/crypto/PEM_write_bio_CMS_stream.pod b/doc/man3/PEM_write_bio_CMS_stream.pod
similarity index 100%
rename from doc/crypto/PEM_write_bio_CMS_stream.pod
rename to doc/man3/PEM_write_bio_CMS_stream.pod
diff --git a/doc/crypto/PEM_write_bio_PKCS7_stream.pod b/doc/man3/PEM_write_bio_PKCS7_stream.pod
similarity index 100%
rename from doc/crypto/PEM_write_bio_PKCS7_stream.pod
rename to doc/man3/PEM_write_bio_PKCS7_stream.pod
diff --git a/doc/crypto/PKCS12_create.pod b/doc/man3/PKCS12_create.pod
similarity index 100%
rename from doc/crypto/PKCS12_create.pod
rename to doc/man3/PKCS12_create.pod
diff --git a/doc/crypto/PKCS12_newpass.pod b/doc/man3/PKCS12_newpass.pod
similarity index 100%
rename from doc/crypto/PKCS12_newpass.pod
rename to doc/man3/PKCS12_newpass.pod
diff --git a/doc/crypto/PKCS12_parse.pod b/doc/man3/PKCS12_parse.pod
similarity index 100%
rename from doc/crypto/PKCS12_parse.pod
rename to doc/man3/PKCS12_parse.pod
diff --git a/doc/crypto/PKCS5_PBKDF2_HMAC.pod b/doc/man3/PKCS5_PBKDF2_HMAC.pod
similarity index 100%
rename from doc/crypto/PKCS5_PBKDF2_HMAC.pod
rename to doc/man3/PKCS5_PBKDF2_HMAC.pod
diff --git a/doc/crypto/PKCS7_decrypt.pod b/doc/man3/PKCS7_decrypt.pod
similarity index 100%
rename from doc/crypto/PKCS7_decrypt.pod
rename to doc/man3/PKCS7_decrypt.pod
diff --git a/doc/crypto/PKCS7_encrypt.pod b/doc/man3/PKCS7_encrypt.pod
similarity index 100%
rename from doc/crypto/PKCS7_encrypt.pod
rename to doc/man3/PKCS7_encrypt.pod
diff --git a/doc/crypto/PKCS7_sign.pod b/doc/man3/PKCS7_sign.pod
similarity index 100%
rename from doc/crypto/PKCS7_sign.pod
rename to doc/man3/PKCS7_sign.pod
diff --git a/doc/crypto/PKCS7_sign_add_signer.pod b/doc/man3/PKCS7_sign_add_signer.pod
similarity index 100%
rename from doc/crypto/PKCS7_sign_add_signer.pod
rename to doc/man3/PKCS7_sign_add_signer.pod
diff --git a/doc/crypto/PKCS7_verify.pod b/doc/man3/PKCS7_verify.pod
similarity index 100%
rename from doc/crypto/PKCS7_verify.pod
rename to doc/man3/PKCS7_verify.pod
diff --git a/doc/crypto/RAND_add.pod b/doc/man3/RAND_add.pod
similarity index 100%
rename from doc/crypto/RAND_add.pod
rename to doc/man3/RAND_add.pod
diff --git a/doc/crypto/RAND_bytes.pod b/doc/man3/RAND_bytes.pod
similarity index 100%
rename from doc/crypto/RAND_bytes.pod
rename to doc/man3/RAND_bytes.pod
diff --git a/doc/crypto/RAND_cleanup.pod b/doc/man3/RAND_cleanup.pod
similarity index 100%
rename from doc/crypto/RAND_cleanup.pod
rename to doc/man3/RAND_cleanup.pod
diff --git a/doc/crypto/RAND_egd.pod b/doc/man3/RAND_egd.pod
similarity index 100%
rename from doc/crypto/RAND_egd.pod
rename to doc/man3/RAND_egd.pod
diff --git a/doc/crypto/RAND_load_file.pod b/doc/man3/RAND_load_file.pod
similarity index 100%
rename from doc/crypto/RAND_load_file.pod
rename to doc/man3/RAND_load_file.pod
diff --git a/doc/crypto/RAND_set_rand_method.pod b/doc/man3/RAND_set_rand_method.pod
similarity index 100%
rename from doc/crypto/RAND_set_rand_method.pod
rename to doc/man3/RAND_set_rand_method.pod
diff --git a/doc/crypto/RC4_set_key.pod b/doc/man3/RC4_set_key.pod
similarity index 100%
rename from doc/crypto/RC4_set_key.pod
rename to doc/man3/RC4_set_key.pod
diff --git a/doc/crypto/RIPEMD160_Init.pod b/doc/man3/RIPEMD160_Init.pod
similarity index 100%
rename from doc/crypto/RIPEMD160_Init.pod
rename to doc/man3/RIPEMD160_Init.pod
diff --git a/doc/crypto/RSA_blinding_on.pod b/doc/man3/RSA_blinding_on.pod
similarity index 100%
rename from doc/crypto/RSA_blinding_on.pod
rename to doc/man3/RSA_blinding_on.pod
diff --git a/doc/crypto/RSA_check_key.pod b/doc/man3/RSA_check_key.pod
similarity index 100%
rename from doc/crypto/RSA_check_key.pod
rename to doc/man3/RSA_check_key.pod
diff --git a/doc/crypto/RSA_generate_key.pod b/doc/man3/RSA_generate_key.pod
similarity index 100%
rename from doc/crypto/RSA_generate_key.pod
rename to doc/man3/RSA_generate_key.pod
diff --git a/doc/crypto/RSA_get0_key.pod b/doc/man3/RSA_get0_key.pod
similarity index 100%
rename from doc/crypto/RSA_get0_key.pod
rename to doc/man3/RSA_get0_key.pod
diff --git a/doc/crypto/RSA_meth_new.pod b/doc/man3/RSA_meth_new.pod
similarity index 100%
rename from doc/crypto/RSA_meth_new.pod
rename to doc/man3/RSA_meth_new.pod
diff --git a/doc/crypto/RSA_new.pod b/doc/man3/RSA_new.pod
similarity index 100%
rename from doc/crypto/RSA_new.pod
rename to doc/man3/RSA_new.pod
diff --git a/doc/crypto/RSA_padding_add_PKCS1_type_1.pod b/doc/man3/RSA_padding_add_PKCS1_type_1.pod
similarity index 100%
rename from doc/crypto/RSA_padding_add_PKCS1_type_1.pod
rename to doc/man3/RSA_padding_add_PKCS1_type_1.pod
diff --git a/doc/crypto/RSA_print.pod b/doc/man3/RSA_print.pod
similarity index 100%
rename from doc/crypto/RSA_print.pod
rename to doc/man3/RSA_print.pod
diff --git a/doc/crypto/RSA_private_encrypt.pod b/doc/man3/RSA_private_encrypt.pod
similarity index 100%
rename from doc/crypto/RSA_private_encrypt.pod
rename to doc/man3/RSA_private_encrypt.pod
diff --git a/doc/crypto/RSA_public_encrypt.pod b/doc/man3/RSA_public_encrypt.pod
similarity index 100%
rename from doc/crypto/RSA_public_encrypt.pod
rename to doc/man3/RSA_public_encrypt.pod
diff --git a/doc/crypto/RSA_set_method.pod b/doc/man3/RSA_set_method.pod
similarity index 100%
rename from doc/crypto/RSA_set_method.pod
rename to doc/man3/RSA_set_method.pod
diff --git a/doc/crypto/RSA_sign.pod b/doc/man3/RSA_sign.pod
similarity index 100%
rename from doc/crypto/RSA_sign.pod
rename to doc/man3/RSA_sign.pod
diff --git a/doc/crypto/RSA_sign_ASN1_OCTET_STRING.pod b/doc/man3/RSA_sign_ASN1_OCTET_STRING.pod
similarity index 100%
rename from doc/crypto/RSA_sign_ASN1_OCTET_STRING.pod
rename to doc/man3/RSA_sign_ASN1_OCTET_STRING.pod
diff --git a/doc/crypto/RSA_size.pod b/doc/man3/RSA_size.pod
similarity index 100%
rename from doc/crypto/RSA_size.pod
rename to doc/man3/RSA_size.pod
diff --git a/doc/crypto/SCT_new.pod b/doc/man3/SCT_new.pod
similarity index 100%
rename from doc/crypto/SCT_new.pod
rename to doc/man3/SCT_new.pod
diff --git a/doc/crypto/SCT_print.pod b/doc/man3/SCT_print.pod
similarity index 100%
rename from doc/crypto/SCT_print.pod
rename to doc/man3/SCT_print.pod
diff --git a/doc/crypto/SCT_validate.pod b/doc/man3/SCT_validate.pod
similarity index 100%
rename from doc/crypto/SCT_validate.pod
rename to doc/man3/SCT_validate.pod
diff --git a/doc/crypto/SHA256_Init.pod b/doc/man3/SHA256_Init.pod
similarity index 100%
rename from doc/crypto/SHA256_Init.pod
rename to doc/man3/SHA256_Init.pod
diff --git a/doc/crypto/SMIME_read_CMS.pod b/doc/man3/SMIME_read_CMS.pod
similarity index 100%
rename from doc/crypto/SMIME_read_CMS.pod
rename to doc/man3/SMIME_read_CMS.pod
diff --git a/doc/crypto/SMIME_read_PKCS7.pod b/doc/man3/SMIME_read_PKCS7.pod
similarity index 100%
rename from doc/crypto/SMIME_read_PKCS7.pod
rename to doc/man3/SMIME_read_PKCS7.pod
diff --git a/doc/crypto/SMIME_write_CMS.pod b/doc/man3/SMIME_write_CMS.pod
similarity index 100%
rename from doc/crypto/SMIME_write_CMS.pod
rename to doc/man3/SMIME_write_CMS.pod
diff --git a/doc/crypto/SMIME_write_PKCS7.pod b/doc/man3/SMIME_write_PKCS7.pod
similarity index 100%
rename from doc/crypto/SMIME_write_PKCS7.pod
rename to doc/man3/SMIME_write_PKCS7.pod
diff --git a/doc/ssl/SSL_CIPHER_get_name.pod b/doc/man3/SSL_CIPHER_get_name.pod
similarity index 100%
rename from doc/ssl/SSL_CIPHER_get_name.pod
rename to doc/man3/SSL_CIPHER_get_name.pod
diff --git a/doc/ssl/SSL_COMP_add_compression_method.pod b/doc/man3/SSL_COMP_add_compression_method.pod
similarity index 100%
rename from doc/ssl/SSL_COMP_add_compression_method.pod
rename to doc/man3/SSL_COMP_add_compression_method.pod
diff --git a/doc/ssl/SSL_CONF_CTX_new.pod b/doc/man3/SSL_CONF_CTX_new.pod
similarity index 100%
rename from doc/ssl/SSL_CONF_CTX_new.pod
rename to doc/man3/SSL_CONF_CTX_new.pod
diff --git a/doc/ssl/SSL_CONF_CTX_set1_prefix.pod b/doc/man3/SSL_CONF_CTX_set1_prefix.pod
similarity index 100%
rename from doc/ssl/SSL_CONF_CTX_set1_prefix.pod
rename to doc/man3/SSL_CONF_CTX_set1_prefix.pod
diff --git a/doc/ssl/SSL_CONF_CTX_set_flags.pod b/doc/man3/SSL_CONF_CTX_set_flags.pod
similarity index 100%
rename from doc/ssl/SSL_CONF_CTX_set_flags.pod
rename to doc/man3/SSL_CONF_CTX_set_flags.pod
diff --git a/doc/ssl/SSL_CONF_CTX_set_ssl_ctx.pod b/doc/man3/SSL_CONF_CTX_set_ssl_ctx.pod
similarity index 100%
rename from doc/ssl/SSL_CONF_CTX_set_ssl_ctx.pod
rename to doc/man3/SSL_CONF_CTX_set_ssl_ctx.pod
diff --git a/doc/ssl/SSL_CONF_cmd.pod b/doc/man3/SSL_CONF_cmd.pod
similarity index 100%
rename from doc/ssl/SSL_CONF_cmd.pod
rename to doc/man3/SSL_CONF_cmd.pod
diff --git a/doc/ssl/SSL_CONF_cmd_argv.pod b/doc/man3/SSL_CONF_cmd_argv.pod
similarity index 100%
rename from doc/ssl/SSL_CONF_cmd_argv.pod
rename to doc/man3/SSL_CONF_cmd_argv.pod
diff --git a/doc/ssl/SSL_CTX_add1_chain_cert.pod b/doc/man3/SSL_CTX_add1_chain_cert.pod
similarity index 100%
rename from doc/ssl/SSL_CTX_add1_chain_cert.pod
rename to doc/man3/SSL_CTX_add1_chain_cert.pod
diff --git a/doc/ssl/SSL_CTX_add_extra_chain_cert.pod b/doc/man3/SSL_CTX_add_extra_chain_cert.pod
similarity index 100%
rename from doc/ssl/SSL_CTX_add_extra_chain_cert.pod
rename to doc/man3/SSL_CTX_add_extra_chain_cert.pod
diff --git a/doc/ssl/SSL_CTX_add_session.pod b/doc/man3/SSL_CTX_add_session.pod
similarity index 100%
rename from doc/ssl/SSL_CTX_add_session.pod
rename to doc/man3/SSL_CTX_add_session.pod
diff --git a/doc/ssl/SSL_CTX_config.pod b/doc/man3/SSL_CTX_config.pod
similarity index 100%
rename from doc/ssl/SSL_CTX_config.pod
rename to doc/man3/SSL_CTX_config.pod
diff --git a/doc/ssl/SSL_CTX_ctrl.pod b/doc/man3/SSL_CTX_ctrl.pod
similarity index 100%
rename from doc/ssl/SSL_CTX_ctrl.pod
rename to doc/man3/SSL_CTX_ctrl.pod
diff --git a/doc/ssl/SSL_CTX_dane_enable.pod b/doc/man3/SSL_CTX_dane_enable.pod
similarity index 100%
rename from doc/ssl/SSL_CTX_dane_enable.pod
rename to doc/man3/SSL_CTX_dane_enable.pod
diff --git a/doc/ssl/SSL_CTX_flush_sessions.pod b/doc/man3/SSL_CTX_flush_sessions.pod
similarity index 100%
rename from doc/ssl/SSL_CTX_flush_sessions.pod
rename to doc/man3/SSL_CTX_flush_sessions.pod
diff --git a/doc/ssl/SSL_CTX_free.pod b/doc/man3/SSL_CTX_free.pod
similarity index 100%
rename from doc/ssl/SSL_CTX_free.pod
rename to doc/man3/SSL_CTX_free.pod
diff --git a/doc/ssl/SSL_CTX_get0_param.pod b/doc/man3/SSL_CTX_get0_param.pod
similarity index 100%
rename from doc/ssl/SSL_CTX_get0_param.pod
rename to doc/man3/SSL_CTX_get0_param.pod
diff --git a/doc/ssl/SSL_CTX_get_verify_mode.pod b/doc/man3/SSL_CTX_get_verify_mode.pod
similarity index 100%
rename from doc/ssl/SSL_CTX_get_verify_mode.pod
rename to doc/man3/SSL_CTX_get_verify_mode.pod
diff --git a/doc/ssl/SSL_CTX_has_client_custom_ext.pod b/doc/man3/SSL_CTX_has_client_custom_ext.pod
similarity index 100%
rename from doc/ssl/SSL_CTX_has_client_custom_ext.pod
rename to doc/man3/SSL_CTX_has_client_custom_ext.pod
diff --git a/doc/ssl/SSL_CTX_load_verify_locations.pod b/doc/man3/SSL_CTX_load_verify_locations.pod
similarity index 100%
rename from doc/ssl/SSL_CTX_load_verify_locations.pod
rename to doc/man3/SSL_CTX_load_verify_locations.pod
diff --git a/doc/ssl/SSL_CTX_new.pod b/doc/man3/SSL_CTX_new.pod
similarity index 100%
rename from doc/ssl/SSL_CTX_new.pod
rename to doc/man3/SSL_CTX_new.pod
diff --git a/doc/ssl/SSL_CTX_sess_number.pod b/doc/man3/SSL_CTX_sess_number.pod
similarity index 100%
rename from doc/ssl/SSL_CTX_sess_number.pod
rename to doc/man3/SSL_CTX_sess_number.pod
diff --git a/doc/ssl/SSL_CTX_sess_set_cache_size.pod b/doc/man3/SSL_CTX_sess_set_cache_size.pod
similarity index 100%
rename from doc/ssl/SSL_CTX_sess_set_cache_size.pod
rename to doc/man3/SSL_CTX_sess_set_cache_size.pod
diff --git a/doc/ssl/SSL_CTX_sess_set_get_cb.pod b/doc/man3/SSL_CTX_sess_set_get_cb.pod
similarity index 100%
rename from doc/ssl/SSL_CTX_sess_set_get_cb.pod
rename to doc/man3/SSL_CTX_sess_set_get_cb.pod
diff --git a/doc/ssl/SSL_CTX_sessions.pod b/doc/man3/SSL_CTX_sessions.pod
similarity index 100%
rename from doc/ssl/SSL_CTX_sessions.pod
rename to doc/man3/SSL_CTX_sessions.pod
diff --git a/doc/ssl/SSL_CTX_set1_curves.pod b/doc/man3/SSL_CTX_set1_curves.pod
similarity index 100%
rename from doc/ssl/SSL_CTX_set1_curves.pod
rename to doc/man3/SSL_CTX_set1_curves.pod
diff --git a/doc/ssl/SSL_CTX_set1_sigalgs.pod b/doc/man3/SSL_CTX_set1_sigalgs.pod
similarity index 100%
rename from doc/ssl/SSL_CTX_set1_sigalgs.pod
rename to doc/man3/SSL_CTX_set1_sigalgs.pod
diff --git a/doc/ssl/SSL_CTX_set1_verify_cert_store.pod b/doc/man3/SSL_CTX_set1_verify_cert_store.pod
similarity index 100%
rename from doc/ssl/SSL_CTX_set1_verify_cert_store.pod
rename to doc/man3/SSL_CTX_set1_verify_cert_store.pod
diff --git a/doc/ssl/SSL_CTX_set_alpn_select_cb.pod b/doc/man3/SSL_CTX_set_alpn_select_cb.pod
similarity index 100%
rename from doc/ssl/SSL_CTX_set_alpn_select_cb.pod
rename to doc/man3/SSL_CTX_set_alpn_select_cb.pod
diff --git a/doc/ssl/SSL_CTX_set_cert_cb.pod b/doc/man3/SSL_CTX_set_cert_cb.pod
similarity index 100%
rename from doc/ssl/SSL_CTX_set_cert_cb.pod
rename to doc/man3/SSL_CTX_set_cert_cb.pod
diff --git a/doc/ssl/SSL_CTX_set_cert_store.pod b/doc/man3/SSL_CTX_set_cert_store.pod
similarity index 100%
rename from doc/ssl/SSL_CTX_set_cert_store.pod
rename to doc/man3/SSL_CTX_set_cert_store.pod
diff --git a/doc/ssl/SSL_CTX_set_cert_verify_callback.pod b/doc/man3/SSL_CTX_set_cert_verify_callback.pod
similarity index 100%
rename from doc/ssl/SSL_CTX_set_cert_verify_callback.pod
rename to doc/man3/SSL_CTX_set_cert_verify_callback.pod
diff --git a/doc/ssl/SSL_CTX_set_cipher_list.pod b/doc/man3/SSL_CTX_set_cipher_list.pod
similarity index 100%
rename from doc/ssl/SSL_CTX_set_cipher_list.pod
rename to doc/man3/SSL_CTX_set_cipher_list.pod
diff --git a/doc/ssl/SSL_CTX_set_client_CA_list.pod b/doc/man3/SSL_CTX_set_client_CA_list.pod
similarity index 100%
rename from doc/ssl/SSL_CTX_set_client_CA_list.pod
rename to doc/man3/SSL_CTX_set_client_CA_list.pod
diff --git a/doc/ssl/SSL_CTX_set_client_cert_cb.pod b/doc/man3/SSL_CTX_set_client_cert_cb.pod
similarity index 100%
rename from doc/ssl/SSL_CTX_set_client_cert_cb.pod
rename to doc/man3/SSL_CTX_set_client_cert_cb.pod
diff --git a/doc/ssl/SSL_CTX_set_ct_validation_callback.pod b/doc/man3/SSL_CTX_set_ct_validation_callback.pod
similarity index 100%
rename from doc/ssl/SSL_CTX_set_ct_validation_callback.pod
rename to doc/man3/SSL_CTX_set_ct_validation_callback.pod
diff --git a/doc/ssl/SSL_CTX_set_ctlog_list_file.pod b/doc/man3/SSL_CTX_set_ctlog_list_file.pod
similarity index 100%
rename from doc/ssl/SSL_CTX_set_ctlog_list_file.pod
rename to doc/man3/SSL_CTX_set_ctlog_list_file.pod
diff --git a/doc/ssl/SSL_CTX_set_default_passwd_cb.pod b/doc/man3/SSL_CTX_set_default_passwd_cb.pod
similarity index 100%
rename from doc/ssl/SSL_CTX_set_default_passwd_cb.pod
rename to doc/man3/SSL_CTX_set_default_passwd_cb.pod
diff --git a/doc/ssl/SSL_CTX_set_generate_session_id.pod b/doc/man3/SSL_CTX_set_generate_session_id.pod
similarity index 100%
rename from doc/ssl/SSL_CTX_set_generate_session_id.pod
rename to doc/man3/SSL_CTX_set_generate_session_id.pod
diff --git a/doc/ssl/SSL_CTX_set_info_callback.pod b/doc/man3/SSL_CTX_set_info_callback.pod
similarity index 100%
rename from doc/ssl/SSL_CTX_set_info_callback.pod
rename to doc/man3/SSL_CTX_set_info_callback.pod
diff --git a/doc/ssl/SSL_CTX_set_max_cert_list.pod b/doc/man3/SSL_CTX_set_max_cert_list.pod
similarity index 100%
rename from doc/ssl/SSL_CTX_set_max_cert_list.pod
rename to doc/man3/SSL_CTX_set_max_cert_list.pod
diff --git a/doc/ssl/SSL_CTX_set_min_proto_version.pod b/doc/man3/SSL_CTX_set_min_proto_version.pod
similarity index 100%
rename from doc/ssl/SSL_CTX_set_min_proto_version.pod
rename to doc/man3/SSL_CTX_set_min_proto_version.pod
diff --git a/doc/ssl/SSL_CTX_set_mode.pod b/doc/man3/SSL_CTX_set_mode.pod
similarity index 100%
rename from doc/ssl/SSL_CTX_set_mode.pod
rename to doc/man3/SSL_CTX_set_mode.pod
diff --git a/doc/ssl/SSL_CTX_set_msg_callback.pod b/doc/man3/SSL_CTX_set_msg_callback.pod
similarity index 100%
rename from doc/ssl/SSL_CTX_set_msg_callback.pod
rename to doc/man3/SSL_CTX_set_msg_callback.pod
diff --git a/doc/ssl/SSL_CTX_set_options.pod b/doc/man3/SSL_CTX_set_options.pod
similarity index 100%
rename from doc/ssl/SSL_CTX_set_options.pod
rename to doc/man3/SSL_CTX_set_options.pod
diff --git a/doc/ssl/SSL_CTX_set_psk_client_callback.pod b/doc/man3/SSL_CTX_set_psk_client_callback.pod
similarity index 100%
rename from doc/ssl/SSL_CTX_set_psk_client_callback.pod
rename to doc/man3/SSL_CTX_set_psk_client_callback.pod
diff --git a/doc/ssl/SSL_CTX_set_quiet_shutdown.pod b/doc/man3/SSL_CTX_set_quiet_shutdown.pod
similarity index 100%
rename from doc/ssl/SSL_CTX_set_quiet_shutdown.pod
rename to doc/man3/SSL_CTX_set_quiet_shutdown.pod
diff --git a/doc/ssl/SSL_CTX_set_read_ahead.pod b/doc/man3/SSL_CTX_set_read_ahead.pod
similarity index 100%
rename from doc/ssl/SSL_CTX_set_read_ahead.pod
rename to doc/man3/SSL_CTX_set_read_ahead.pod
diff --git a/doc/ssl/SSL_CTX_set_security_level.pod b/doc/man3/SSL_CTX_set_security_level.pod
similarity index 100%
rename from doc/ssl/SSL_CTX_set_security_level.pod
rename to doc/man3/SSL_CTX_set_security_level.pod
diff --git a/doc/ssl/SSL_CTX_set_session_cache_mode.pod b/doc/man3/SSL_CTX_set_session_cache_mode.pod
similarity index 100%
rename from doc/ssl/SSL_CTX_set_session_cache_mode.pod
rename to doc/man3/SSL_CTX_set_session_cache_mode.pod
diff --git a/doc/ssl/SSL_CTX_set_session_id_context.pod b/doc/man3/SSL_CTX_set_session_id_context.pod
similarity index 100%
rename from doc/ssl/SSL_CTX_set_session_id_context.pod
rename to doc/man3/SSL_CTX_set_session_id_context.pod
diff --git a/doc/ssl/SSL_CTX_set_split_send_fragment.pod b/doc/man3/SSL_CTX_set_split_send_fragment.pod
similarity index 100%
rename from doc/ssl/SSL_CTX_set_split_send_fragment.pod
rename to doc/man3/SSL_CTX_set_split_send_fragment.pod
diff --git a/doc/ssl/SSL_CTX_set_ssl_version.pod b/doc/man3/SSL_CTX_set_ssl_version.pod
similarity index 100%
rename from doc/ssl/SSL_CTX_set_ssl_version.pod
rename to doc/man3/SSL_CTX_set_ssl_version.pod
diff --git a/doc/ssl/SSL_CTX_set_timeout.pod b/doc/man3/SSL_CTX_set_timeout.pod
similarity index 100%
rename from doc/ssl/SSL_CTX_set_timeout.pod
rename to doc/man3/SSL_CTX_set_timeout.pod
diff --git a/doc/ssl/SSL_CTX_set_tlsext_status_cb.pod b/doc/man3/SSL_CTX_set_tlsext_status_cb.pod
similarity index 100%
rename from doc/ssl/SSL_CTX_set_tlsext_status_cb.pod
rename to doc/man3/SSL_CTX_set_tlsext_status_cb.pod
diff --git a/doc/ssl/SSL_CTX_set_tlsext_ticket_key_cb.pod b/doc/man3/SSL_CTX_set_tlsext_ticket_key_cb.pod
similarity index 100%
rename from doc/ssl/SSL_CTX_set_tlsext_ticket_key_cb.pod
rename to doc/man3/SSL_CTX_set_tlsext_ticket_key_cb.pod
diff --git a/doc/ssl/SSL_CTX_set_tmp_dh_callback.pod b/doc/man3/SSL_CTX_set_tmp_dh_callback.pod
similarity index 100%
rename from doc/ssl/SSL_CTX_set_tmp_dh_callback.pod
rename to doc/man3/SSL_CTX_set_tmp_dh_callback.pod
diff --git a/doc/ssl/SSL_CTX_set_verify.pod b/doc/man3/SSL_CTX_set_verify.pod
similarity index 100%
rename from doc/ssl/SSL_CTX_set_verify.pod
rename to doc/man3/SSL_CTX_set_verify.pod
diff --git a/doc/ssl/SSL_CTX_use_certificate.pod b/doc/man3/SSL_CTX_use_certificate.pod
similarity index 100%
rename from doc/ssl/SSL_CTX_use_certificate.pod
rename to doc/man3/SSL_CTX_use_certificate.pod
diff --git a/doc/ssl/SSL_CTX_use_psk_identity_hint.pod b/doc/man3/SSL_CTX_use_psk_identity_hint.pod
similarity index 100%
rename from doc/ssl/SSL_CTX_use_psk_identity_hint.pod
rename to doc/man3/SSL_CTX_use_psk_identity_hint.pod
diff --git a/doc/ssl/SSL_CTX_use_serverinfo.pod b/doc/man3/SSL_CTX_use_serverinfo.pod
similarity index 100%
rename from doc/ssl/SSL_CTX_use_serverinfo.pod
rename to doc/man3/SSL_CTX_use_serverinfo.pod
diff --git a/doc/ssl/SSL_SESSION_free.pod b/doc/man3/SSL_SESSION_free.pod
similarity index 100%
rename from doc/ssl/SSL_SESSION_free.pod
rename to doc/man3/SSL_SESSION_free.pod
diff --git a/doc/ssl/SSL_SESSION_get0_cipher.pod b/doc/man3/SSL_SESSION_get0_cipher.pod
similarity index 100%
rename from doc/ssl/SSL_SESSION_get0_cipher.pod
rename to doc/man3/SSL_SESSION_get0_cipher.pod
diff --git a/doc/ssl/SSL_SESSION_get0_hostname.pod b/doc/man3/SSL_SESSION_get0_hostname.pod
similarity index 100%
rename from doc/ssl/SSL_SESSION_get0_hostname.pod
rename to doc/man3/SSL_SESSION_get0_hostname.pod
diff --git a/doc/ssl/SSL_SESSION_get0_id_context.pod b/doc/man3/SSL_SESSION_get0_id_context.pod
similarity index 100%
rename from doc/ssl/SSL_SESSION_get0_id_context.pod
rename to doc/man3/SSL_SESSION_get0_id_context.pod
diff --git a/doc/ssl/SSL_SESSION_get_protocol_version.pod b/doc/man3/SSL_SESSION_get_protocol_version.pod
similarity index 100%
rename from doc/ssl/SSL_SESSION_get_protocol_version.pod
rename to doc/man3/SSL_SESSION_get_protocol_version.pod
diff --git a/doc/ssl/SSL_SESSION_get_time.pod b/doc/man3/SSL_SESSION_get_time.pod
similarity index 100%
rename from doc/ssl/SSL_SESSION_get_time.pod
rename to doc/man3/SSL_SESSION_get_time.pod
diff --git a/doc/ssl/SSL_SESSION_has_ticket.pod b/doc/man3/SSL_SESSION_has_ticket.pod
similarity index 100%
rename from doc/ssl/SSL_SESSION_has_ticket.pod
rename to doc/man3/SSL_SESSION_has_ticket.pod
diff --git a/doc/ssl/SSL_SESSION_set1_id.pod b/doc/man3/SSL_SESSION_set1_id.pod
similarity index 100%
rename from doc/ssl/SSL_SESSION_set1_id.pod
rename to doc/man3/SSL_SESSION_set1_id.pod
diff --git a/doc/ssl/SSL_accept.pod b/doc/man3/SSL_accept.pod
similarity index 100%
rename from doc/ssl/SSL_accept.pod
rename to doc/man3/SSL_accept.pod
diff --git a/doc/ssl/SSL_alert_type_string.pod b/doc/man3/SSL_alert_type_string.pod
similarity index 100%
rename from doc/ssl/SSL_alert_type_string.pod
rename to doc/man3/SSL_alert_type_string.pod
diff --git a/doc/ssl/SSL_check_chain.pod b/doc/man3/SSL_check_chain.pod
similarity index 100%
rename from doc/ssl/SSL_check_chain.pod
rename to doc/man3/SSL_check_chain.pod
diff --git a/doc/ssl/SSL_clear.pod b/doc/man3/SSL_clear.pod
similarity index 100%
rename from doc/ssl/SSL_clear.pod
rename to doc/man3/SSL_clear.pod
diff --git a/doc/ssl/SSL_connect.pod b/doc/man3/SSL_connect.pod
similarity index 100%
rename from doc/ssl/SSL_connect.pod
rename to doc/man3/SSL_connect.pod
diff --git a/doc/ssl/SSL_do_handshake.pod b/doc/man3/SSL_do_handshake.pod
similarity index 100%
rename from doc/ssl/SSL_do_handshake.pod
rename to doc/man3/SSL_do_handshake.pod
diff --git a/doc/ssl/SSL_extension_supported.pod b/doc/man3/SSL_extension_supported.pod
similarity index 100%
rename from doc/ssl/SSL_extension_supported.pod
rename to doc/man3/SSL_extension_supported.pod
diff --git a/doc/ssl/SSL_free.pod b/doc/man3/SSL_free.pod
similarity index 100%
rename from doc/ssl/SSL_free.pod
rename to doc/man3/SSL_free.pod
diff --git a/doc/ssl/SSL_get0_peer_scts.pod b/doc/man3/SSL_get0_peer_scts.pod
similarity index 100%
rename from doc/ssl/SSL_get0_peer_scts.pod
rename to doc/man3/SSL_get0_peer_scts.pod
diff --git a/doc/ssl/SSL_get_SSL_CTX.pod b/doc/man3/SSL_get_SSL_CTX.pod
similarity index 100%
rename from doc/ssl/SSL_get_SSL_CTX.pod
rename to doc/man3/SSL_get_SSL_CTX.pod
diff --git a/doc/ssl/SSL_get_all_async_fds.pod b/doc/man3/SSL_get_all_async_fds.pod
similarity index 100%
rename from doc/ssl/SSL_get_all_async_fds.pod
rename to doc/man3/SSL_get_all_async_fds.pod
diff --git a/doc/ssl/SSL_get_ciphers.pod b/doc/man3/SSL_get_ciphers.pod
similarity index 100%
rename from doc/ssl/SSL_get_ciphers.pod
rename to doc/man3/SSL_get_ciphers.pod
diff --git a/doc/ssl/SSL_get_client_CA_list.pod b/doc/man3/SSL_get_client_CA_list.pod
similarity index 100%
rename from doc/ssl/SSL_get_client_CA_list.pod
rename to doc/man3/SSL_get_client_CA_list.pod
diff --git a/doc/ssl/SSL_get_client_random.pod b/doc/man3/SSL_get_client_random.pod
similarity index 100%
rename from doc/ssl/SSL_get_client_random.pod
rename to doc/man3/SSL_get_client_random.pod
diff --git a/doc/ssl/SSL_get_current_cipher.pod b/doc/man3/SSL_get_current_cipher.pod
similarity index 100%
rename from doc/ssl/SSL_get_current_cipher.pod
rename to doc/man3/SSL_get_current_cipher.pod
diff --git a/doc/ssl/SSL_get_default_timeout.pod b/doc/man3/SSL_get_default_timeout.pod
similarity index 100%
rename from doc/ssl/SSL_get_default_timeout.pod
rename to doc/man3/SSL_get_default_timeout.pod
diff --git a/doc/ssl/SSL_get_error.pod b/doc/man3/SSL_get_error.pod
similarity index 100%
rename from doc/ssl/SSL_get_error.pod
rename to doc/man3/SSL_get_error.pod
diff --git a/doc/ssl/SSL_get_extms_support.pod b/doc/man3/SSL_get_extms_support.pod
similarity index 100%
rename from doc/ssl/SSL_get_extms_support.pod
rename to doc/man3/SSL_get_extms_support.pod
diff --git a/doc/ssl/SSL_get_fd.pod b/doc/man3/SSL_get_fd.pod
similarity index 100%
rename from doc/ssl/SSL_get_fd.pod
rename to doc/man3/SSL_get_fd.pod
diff --git a/doc/ssl/SSL_get_peer_cert_chain.pod b/doc/man3/SSL_get_peer_cert_chain.pod
similarity index 100%
rename from doc/ssl/SSL_get_peer_cert_chain.pod
rename to doc/man3/SSL_get_peer_cert_chain.pod
diff --git a/doc/ssl/SSL_get_peer_certificate.pod b/doc/man3/SSL_get_peer_certificate.pod
similarity index 100%
rename from doc/ssl/SSL_get_peer_certificate.pod
rename to doc/man3/SSL_get_peer_certificate.pod
diff --git a/doc/ssl/SSL_get_psk_identity.pod b/doc/man3/SSL_get_psk_identity.pod
similarity index 100%
rename from doc/ssl/SSL_get_psk_identity.pod
rename to doc/man3/SSL_get_psk_identity.pod
diff --git a/doc/ssl/SSL_get_rbio.pod b/doc/man3/SSL_get_rbio.pod
similarity index 100%
rename from doc/ssl/SSL_get_rbio.pod
rename to doc/man3/SSL_get_rbio.pod
diff --git a/doc/ssl/SSL_get_session.pod b/doc/man3/SSL_get_session.pod
similarity index 100%
rename from doc/ssl/SSL_get_session.pod
rename to doc/man3/SSL_get_session.pod
diff --git a/doc/ssl/SSL_get_shared_sigalgs.pod b/doc/man3/SSL_get_shared_sigalgs.pod
similarity index 100%
rename from doc/ssl/SSL_get_shared_sigalgs.pod
rename to doc/man3/SSL_get_shared_sigalgs.pod
diff --git a/doc/ssl/SSL_get_verify_result.pod b/doc/man3/SSL_get_verify_result.pod
similarity index 100%
rename from doc/ssl/SSL_get_verify_result.pod
rename to doc/man3/SSL_get_verify_result.pod
diff --git a/doc/ssl/SSL_get_version.pod b/doc/man3/SSL_get_version.pod
similarity index 100%
rename from doc/ssl/SSL_get_version.pod
rename to doc/man3/SSL_get_version.pod
diff --git a/doc/ssl/SSL_library_init.pod b/doc/man3/SSL_library_init.pod
similarity index 100%
rename from doc/ssl/SSL_library_init.pod
rename to doc/man3/SSL_library_init.pod
diff --git a/doc/ssl/SSL_load_client_CA_file.pod b/doc/man3/SSL_load_client_CA_file.pod
similarity index 100%
rename from doc/ssl/SSL_load_client_CA_file.pod
rename to doc/man3/SSL_load_client_CA_file.pod
diff --git a/doc/ssl/SSL_new.pod b/doc/man3/SSL_new.pod
similarity index 100%
rename from doc/ssl/SSL_new.pod
rename to doc/man3/SSL_new.pod
diff --git a/doc/ssl/SSL_pending.pod b/doc/man3/SSL_pending.pod
similarity index 100%
rename from doc/ssl/SSL_pending.pod
rename to doc/man3/SSL_pending.pod
diff --git a/doc/ssl/SSL_read.pod b/doc/man3/SSL_read.pod
similarity index 100%
rename from doc/ssl/SSL_read.pod
rename to doc/man3/SSL_read.pod
diff --git a/doc/ssl/SSL_rstate_string.pod b/doc/man3/SSL_rstate_string.pod
similarity index 100%
rename from doc/ssl/SSL_rstate_string.pod
rename to doc/man3/SSL_rstate_string.pod
diff --git a/doc/ssl/SSL_session_reused.pod b/doc/man3/SSL_session_reused.pod
similarity index 100%
rename from doc/ssl/SSL_session_reused.pod
rename to doc/man3/SSL_session_reused.pod
diff --git a/doc/ssl/SSL_set1_host.pod b/doc/man3/SSL_set1_host.pod
similarity index 100%
rename from doc/ssl/SSL_set1_host.pod
rename to doc/man3/SSL_set1_host.pod
diff --git a/doc/ssl/SSL_set_bio.pod b/doc/man3/SSL_set_bio.pod
similarity index 100%
rename from doc/ssl/SSL_set_bio.pod
rename to doc/man3/SSL_set_bio.pod
diff --git a/doc/ssl/SSL_set_connect_state.pod b/doc/man3/SSL_set_connect_state.pod
similarity index 100%
rename from doc/ssl/SSL_set_connect_state.pod
rename to doc/man3/SSL_set_connect_state.pod
diff --git a/doc/ssl/SSL_set_fd.pod b/doc/man3/SSL_set_fd.pod
similarity index 100%
rename from doc/ssl/SSL_set_fd.pod
rename to doc/man3/SSL_set_fd.pod
diff --git a/doc/ssl/SSL_set_session.pod b/doc/man3/SSL_set_session.pod
similarity index 100%
rename from doc/ssl/SSL_set_session.pod
rename to doc/man3/SSL_set_session.pod
diff --git a/doc/ssl/SSL_set_shutdown.pod b/doc/man3/SSL_set_shutdown.pod
similarity index 100%
rename from doc/ssl/SSL_set_shutdown.pod
rename to doc/man3/SSL_set_shutdown.pod
diff --git a/doc/ssl/SSL_set_verify_result.pod b/doc/man3/SSL_set_verify_result.pod
similarity index 100%
rename from doc/ssl/SSL_set_verify_result.pod
rename to doc/man3/SSL_set_verify_result.pod
diff --git a/doc/ssl/SSL_shutdown.pod b/doc/man3/SSL_shutdown.pod
similarity index 100%
rename from doc/ssl/SSL_shutdown.pod
rename to doc/man3/SSL_shutdown.pod
diff --git a/doc/ssl/SSL_state_string.pod b/doc/man3/SSL_state_string.pod
similarity index 100%
rename from doc/ssl/SSL_state_string.pod
rename to doc/man3/SSL_state_string.pod
diff --git a/doc/ssl/SSL_want.pod b/doc/man3/SSL_want.pod
similarity index 100%
rename from doc/ssl/SSL_want.pod
rename to doc/man3/SSL_want.pod
diff --git a/doc/ssl/SSL_write.pod b/doc/man3/SSL_write.pod
similarity index 100%
rename from doc/ssl/SSL_write.pod
rename to doc/man3/SSL_write.pod
diff --git a/doc/crypto/UI_new.pod b/doc/man3/UI_new.pod
similarity index 100%
rename from doc/crypto/UI_new.pod
rename to doc/man3/UI_new.pod
diff --git a/doc/crypto/X509V3_get_d2i.pod b/doc/man3/X509V3_get_d2i.pod
similarity index 100%
rename from doc/crypto/X509V3_get_d2i.pod
rename to doc/man3/X509V3_get_d2i.pod
diff --git a/doc/crypto/X509_ALGOR_dup.pod b/doc/man3/X509_ALGOR_dup.pod
similarity index 100%
rename from doc/crypto/X509_ALGOR_dup.pod
rename to doc/man3/X509_ALGOR_dup.pod
diff --git a/doc/crypto/X509_CRL_get0_by_serial.pod b/doc/man3/X509_CRL_get0_by_serial.pod
similarity index 100%
rename from doc/crypto/X509_CRL_get0_by_serial.pod
rename to doc/man3/X509_CRL_get0_by_serial.pod
diff --git a/doc/crypto/X509_EXTENSION_set_object.pod b/doc/man3/X509_EXTENSION_set_object.pod
similarity index 100%
rename from doc/crypto/X509_EXTENSION_set_object.pod
rename to doc/man3/X509_EXTENSION_set_object.pod
diff --git a/doc/crypto/X509_LOOKUP_hash_dir.pod b/doc/man3/X509_LOOKUP_hash_dir.pod
similarity index 100%
rename from doc/crypto/X509_LOOKUP_hash_dir.pod
rename to doc/man3/X509_LOOKUP_hash_dir.pod
diff --git a/doc/crypto/X509_NAME_ENTRY_get_object.pod b/doc/man3/X509_NAME_ENTRY_get_object.pod
similarity index 100%
rename from doc/crypto/X509_NAME_ENTRY_get_object.pod
rename to doc/man3/X509_NAME_ENTRY_get_object.pod
diff --git a/doc/crypto/X509_NAME_add_entry_by_txt.pod b/doc/man3/X509_NAME_add_entry_by_txt.pod
similarity index 100%
rename from doc/crypto/X509_NAME_add_entry_by_txt.pod
rename to doc/man3/X509_NAME_add_entry_by_txt.pod
diff --git a/doc/crypto/X509_NAME_get0_der.pod b/doc/man3/X509_NAME_get0_der.pod
similarity index 100%
rename from doc/crypto/X509_NAME_get0_der.pod
rename to doc/man3/X509_NAME_get0_der.pod
diff --git a/doc/crypto/X509_NAME_get_index_by_NID.pod b/doc/man3/X509_NAME_get_index_by_NID.pod
similarity index 100%
rename from doc/crypto/X509_NAME_get_index_by_NID.pod
rename to doc/man3/X509_NAME_get_index_by_NID.pod
diff --git a/doc/crypto/X509_NAME_print_ex.pod b/doc/man3/X509_NAME_print_ex.pod
similarity index 100%
rename from doc/crypto/X509_NAME_print_ex.pod
rename to doc/man3/X509_NAME_print_ex.pod
diff --git a/doc/crypto/X509_PUBKEY_new.pod b/doc/man3/X509_PUBKEY_new.pod
similarity index 100%
rename from doc/crypto/X509_PUBKEY_new.pod
rename to doc/man3/X509_PUBKEY_new.pod
diff --git a/doc/crypto/X509_SIG_get0.pod b/doc/man3/X509_SIG_get0.pod
similarity index 100%
rename from doc/crypto/X509_SIG_get0.pod
rename to doc/man3/X509_SIG_get0.pod
diff --git a/doc/crypto/X509_STORE_CTX_get_error.pod b/doc/man3/X509_STORE_CTX_get_error.pod
similarity index 100%
rename from doc/crypto/X509_STORE_CTX_get_error.pod
rename to doc/man3/X509_STORE_CTX_get_error.pod
diff --git a/doc/crypto/X509_STORE_CTX_new.pod b/doc/man3/X509_STORE_CTX_new.pod
similarity index 88%
rename from doc/crypto/X509_STORE_CTX_new.pod
rename to doc/man3/X509_STORE_CTX_new.pod
index bf587a3..880c66c 100644
--- a/doc/crypto/X509_STORE_CTX_new.pod
+++ b/doc/man3/X509_STORE_CTX_new.pod
@@ -10,9 +10,8 @@
 X509_STORE_CTX_get0_untrusted, X509_STORE_CTX_set0_untrusted,
 X509_STORE_CTX_get_num_untrusted,
 X509_STORE_CTX_set_default,
-X509_STORE_CTX_set_verify,
-X509_STORE_set_verify,
-X509_STORE_CTX_get_verify - X509_STORE_CTX initialisation
+X509_STORE_CTX_set_verify
+- X509_STORE_CTX initialisation
 
 =head1 SYNOPSIS
 
@@ -42,11 +41,8 @@
  int X509_STORE_CTX_get_num_untrusted(X509_STORE_CTX *ctx);
 
  typedef int (*X509_STORE_CTX_verify_fn)(X509_STORE_CTX *);
- X509_STORE_CTX_verify_fn X509_STORE_CTX_get_verify(X509_STORE_CTX *ctx);
  void X509_STORE_CTX_set_verify(X509_STORE_CTX *ctx, X509_STORE_CTX_verify_fn verify);
 
- void X509_STORE_set_verify(X509_STORE *ctx, X509_STORE_CTX_verify verify);
-
 =head1 DESCRIPTION
 
 These functions initialise an B<X509_STORE_CTX> structure for subsequent use
@@ -113,12 +109,7 @@
 
 X509_STORE_CTX_set_verify() provides the capability for overriding the default
 verify function. This function is responsible for verifying chain signatures and
-expiration times. X509_STORE_CTX_get_verify() obtains the current verify
-function being used.
-
-X509_STORE_set_verify() works in the same way as for X509_STORE_CTX_set_verify()
-but sets the default verify function to be used by all X509_STORE_CTX objects
-created for this X509_STORE.
+expiration times.
 
 A verify function is defined as an X509_STORE_CTX_verify type which has the
 following signature:
@@ -160,9 +151,6 @@
 X509_STORE_CTX_get_num_untrusted() returns the number of untrusted certificates
 used.
 
-X509_STORE_CTX_get_verify() returns the current verify function in use for this
-X509_STORE_CTX.
-
 =head1 SEE ALSO
 
 L<X509_verify_cert(3)>
@@ -172,9 +160,6 @@
 
 X509_STORE_CTX_set0_crls() was first added to OpenSSL 1.0.0
 X509_STORE_CTX_get_num_untrusted() was first added to OpenSSL 1.1.0
-X509_STORE_set_verify() was first added to OpenSSL 1.1.0. It was previously
-available as a macro X509_STORE_set_verify_func(). This macro still exists but
-simply calls this function.
 
 =head1 COPYRIGHT
 
diff --git a/doc/crypto/X509_STORE_CTX_set_verify_cb.pod b/doc/man3/X509_STORE_CTX_set_verify_cb.pod
similarity index 96%
rename from doc/crypto/X509_STORE_CTX_set_verify_cb.pod
rename to doc/man3/X509_STORE_CTX_set_verify_cb.pod
index 266a4c1..78f2c3d 100644
--- a/doc/crypto/X509_STORE_CTX_set_verify_cb.pod
+++ b/doc/man3/X509_STORE_CTX_set_verify_cb.pod
@@ -12,7 +12,6 @@
 X509_STORE_CTX_get_check_revocation,
 X509_STORE_CTX_get_check_issued,
 X509_STORE_CTX_get_get_issuer,
-X509_STORE_CTX_get_verify,
 X509_STORE_CTX_get_verify_cb,
 X509_STORE_CTX_set_verify_cb - get and set verification callback
 
@@ -27,7 +26,6 @@
  void X509_STORE_CTX_set_verify_cb(X509_STORE_CTX *ctx,
                                    X509_STORE_CTX_verify_cb verify_cb);
 
- X509_STORE_CTX_verify_fn X509_STORE_CTX_get_verify(X509_STORE_CTX *ctx);
  X509_STORE_CTX_get_issuer_fn X509_STORE_CTX_get_get_issuer(X509_STORE_CTX *ctx);
  X509_STORE_CTX_check_issued_fn X509_STORE_CTX_get_check_issued(X509_STORE_CTX *ctx);
  X509_STORE_CTX_check_revocation_fn X509_STORE_CTX_get_check_revocation(X509_STORE_CTX *ctx);
@@ -66,7 +64,7 @@
 X509_STORE_CTX_get_verify_cb() returns the value of the current callback
 for the specific B<ctx>.
 
-X509_STORE_CTX_get_verify(), X509_STORE_CTX_get_get_issuer(),
+X509_STORE_CTX_get_get_issuer(),
 X509_STORE_CTX_get_check_issued(), X509_STORE_CTX_get_check_revocation(),
 X509_STORE_CTX_get_get_crl(), X509_STORE_CTX_get_check_crl(),
 X509_STORE_CTX_get_cert_crl(), X509_STORE_CTX_get_check_policy(),
@@ -196,7 +194,7 @@
 
 =head1 HISTORY
 
-X509_STORE_CTX_get_verify(), X509_STORE_CTX_get_get_issuer(),
+X509_STORE_CTX_get_get_issuer(),
 X509_STORE_CTX_get_check_issued(), X509_STORE_CTX_get_check_revocation(),
 X509_STORE_CTX_get_get_crl(), X509_STORE_CTX_get_check_crl(),
 X509_STORE_CTX_get_cert_crl(), X509_STORE_CTX_get_check_policy(),
diff --git a/doc/crypto/X509_STORE_get0_param.pod b/doc/man3/X509_STORE_get0_param.pod
similarity index 100%
rename from doc/crypto/X509_STORE_get0_param.pod
rename to doc/man3/X509_STORE_get0_param.pod
diff --git a/doc/crypto/X509_STORE_new.pod b/doc/man3/X509_STORE_new.pod
similarity index 100%
rename from doc/crypto/X509_STORE_new.pod
rename to doc/man3/X509_STORE_new.pod
diff --git a/doc/crypto/X509_STORE_set_verify_cb_func.pod b/doc/man3/X509_STORE_set_verify_cb_func.pod
similarity index 100%
rename from doc/crypto/X509_STORE_set_verify_cb_func.pod
rename to doc/man3/X509_STORE_set_verify_cb_func.pod
diff --git a/doc/crypto/X509_VERIFY_PARAM_set_flags.pod b/doc/man3/X509_VERIFY_PARAM_set_flags.pod
similarity index 100%
rename from doc/crypto/X509_VERIFY_PARAM_set_flags.pod
rename to doc/man3/X509_VERIFY_PARAM_set_flags.pod
diff --git a/doc/crypto/X509_check_ca.pod b/doc/man3/X509_check_ca.pod
similarity index 100%
rename from doc/crypto/X509_check_ca.pod
rename to doc/man3/X509_check_ca.pod
diff --git a/doc/crypto/X509_check_host.pod b/doc/man3/X509_check_host.pod
similarity index 100%
rename from doc/crypto/X509_check_host.pod
rename to doc/man3/X509_check_host.pod
diff --git a/doc/crypto/X509_check_issued.pod b/doc/man3/X509_check_issued.pod
similarity index 100%
rename from doc/crypto/X509_check_issued.pod
rename to doc/man3/X509_check_issued.pod
diff --git a/doc/crypto/X509_dup.pod b/doc/man3/X509_dup.pod
similarity index 99%
rename from doc/crypto/X509_dup.pod
rename to doc/man3/X509_dup.pod
index 574994d..d704962 100644
--- a/doc/crypto/X509_dup.pod
+++ b/doc/man3/X509_dup.pod
@@ -170,7 +170,6 @@
 RSA_OAEP_PARAMS_new,
 RSA_PSS_PARAMS_free,
 RSA_PSS_PARAMS_new,
-SCT_LIST_free,
 SXNETID_free,
 SXNETID_new,
 SXNET_free,
diff --git a/doc/crypto/X509_get0_signature.pod b/doc/man3/X509_get0_signature.pod
similarity index 100%
rename from doc/crypto/X509_get0_signature.pod
rename to doc/man3/X509_get0_signature.pod
diff --git a/doc/crypto/X509_get0_uids.pod b/doc/man3/X509_get0_uids.pod
similarity index 100%
rename from doc/crypto/X509_get0_uids.pod
rename to doc/man3/X509_get0_uids.pod
diff --git a/doc/crypto/X509_get_extension_flags.pod b/doc/man3/X509_get_extension_flags.pod
similarity index 100%
rename from doc/crypto/X509_get_extension_flags.pod
rename to doc/man3/X509_get_extension_flags.pod
diff --git a/doc/crypto/X509_get_notBefore.pod b/doc/man3/X509_get_notBefore.pod
similarity index 100%
rename from doc/crypto/X509_get_notBefore.pod
rename to doc/man3/X509_get_notBefore.pod
diff --git a/doc/crypto/X509_get_pubkey.pod b/doc/man3/X509_get_pubkey.pod
similarity index 100%
rename from doc/crypto/X509_get_pubkey.pod
rename to doc/man3/X509_get_pubkey.pod
diff --git a/doc/crypto/X509_get_serialNumber.pod b/doc/man3/X509_get_serialNumber.pod
similarity index 100%
rename from doc/crypto/X509_get_serialNumber.pod
rename to doc/man3/X509_get_serialNumber.pod
diff --git a/doc/crypto/X509_get_subject_name.pod b/doc/man3/X509_get_subject_name.pod
similarity index 100%
rename from doc/crypto/X509_get_subject_name.pod
rename to doc/man3/X509_get_subject_name.pod
diff --git a/doc/crypto/X509_get_version.pod b/doc/man3/X509_get_version.pod
similarity index 100%
rename from doc/crypto/X509_get_version.pod
rename to doc/man3/X509_get_version.pod
diff --git a/doc/crypto/X509_new.pod b/doc/man3/X509_new.pod
similarity index 100%
rename from doc/crypto/X509_new.pod
rename to doc/man3/X509_new.pod
diff --git a/doc/crypto/X509_sign.pod b/doc/man3/X509_sign.pod
similarity index 100%
rename from doc/crypto/X509_sign.pod
rename to doc/man3/X509_sign.pod
diff --git a/doc/crypto/X509_verify_cert.pod b/doc/man3/X509_verify_cert.pod
similarity index 100%
rename from doc/crypto/X509_verify_cert.pod
rename to doc/man3/X509_verify_cert.pod
diff --git a/doc/crypto/X509v3_get_ext_by_NID.pod b/doc/man3/X509v3_get_ext_by_NID.pod
similarity index 100%
rename from doc/crypto/X509v3_get_ext_by_NID.pod
rename to doc/man3/X509v3_get_ext_by_NID.pod
diff --git a/doc/crypto/d2i_DHparams.pod b/doc/man3/d2i_DHparams.pod
similarity index 100%
rename from doc/crypto/d2i_DHparams.pod
rename to doc/man3/d2i_DHparams.pod
diff --git a/doc/crypto/d2i_Netscape_RSA.pod b/doc/man3/d2i_Netscape_RSA.pod
similarity index 100%
rename from doc/crypto/d2i_Netscape_RSA.pod
rename to doc/man3/d2i_Netscape_RSA.pod
diff --git a/doc/crypto/d2i_PKCS8PrivateKey_bio.pod b/doc/man3/d2i_PKCS8PrivateKey_bio.pod
similarity index 100%
rename from doc/crypto/d2i_PKCS8PrivateKey_bio.pod
rename to doc/man3/d2i_PKCS8PrivateKey_bio.pod
diff --git a/doc/crypto/d2i_PrivateKey.pod b/doc/man3/d2i_PrivateKey.pod
similarity index 100%
rename from doc/crypto/d2i_PrivateKey.pod
rename to doc/man3/d2i_PrivateKey.pod
diff --git a/doc/ssl/d2i_SSL_SESSION.pod b/doc/man3/d2i_SSL_SESSION.pod
similarity index 100%
rename from doc/ssl/d2i_SSL_SESSION.pod
rename to doc/man3/d2i_SSL_SESSION.pod
diff --git a/doc/crypto/d2i_X509.pod b/doc/man3/d2i_X509.pod
similarity index 100%
rename from doc/crypto/d2i_X509.pod
rename to doc/man3/d2i_X509.pod
diff --git a/doc/crypto/i2d_CMS_bio_stream.pod b/doc/man3/i2d_CMS_bio_stream.pod
similarity index 100%
rename from doc/crypto/i2d_CMS_bio_stream.pod
rename to doc/man3/i2d_CMS_bio_stream.pod
diff --git a/doc/crypto/i2d_PKCS7_bio_stream.pod b/doc/man3/i2d_PKCS7_bio_stream.pod
similarity index 100%
rename from doc/crypto/i2d_PKCS7_bio_stream.pod
rename to doc/man3/i2d_PKCS7_bio_stream.pod
diff --git a/doc/crypto/i2d_re_X509_tbs.pod b/doc/man3/i2d_re_X509_tbs.pod
similarity index 100%
rename from doc/crypto/i2d_re_X509_tbs.pod
rename to doc/man3/i2d_re_X509_tbs.pod
diff --git a/doc/crypto/o2i_SCT_LIST.pod b/doc/man3/o2i_SCT_LIST.pod
similarity index 100%
rename from doc/crypto/o2i_SCT_LIST.pod
rename to doc/man3/o2i_SCT_LIST.pod
diff --git a/doc/apps/config.pod b/doc/man5/config.pod
similarity index 99%
rename from doc/apps/config.pod
rename to doc/man5/config.pod
index a9cde89..9df0ecb 100644
--- a/doc/apps/config.pod
+++ b/doc/man5/config.pod
@@ -1,7 +1,5 @@
 =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/man5/x509v3_config.pod
similarity index 99%
rename from doc/apps/x509v3_config.pod
rename to doc/man5/x509v3_config.pod
index edfd76e..e78cf7d 100644
--- a/doc/apps/x509v3_config.pod
+++ b/doc/man5/x509v3_config.pod
@@ -1,7 +1,5 @@
 =pod
 
-=for comment openssl_manual_section:5
-
 =head1 NAME
 
 x509v3_config - X509 V3 certificate extension configuration format
diff --git a/doc/crypto/bio.pod b/doc/man7/bio.pod
similarity index 98%
rename from doc/crypto/bio.pod
rename to doc/man7/bio.pod
index 1e1dd02..ec0d2df 100644
--- a/doc/crypto/bio.pod
+++ b/doc/man7/bio.pod
@@ -1,7 +1,5 @@
 =pod
 
-=for comment openssl_manual_section 7
-
 =head1 NAME
 
 bio - Basic I/O abstraction
diff --git a/doc/crypto/crypto.pod b/doc/man7/crypto.pod
similarity index 97%
rename from doc/crypto/crypto.pod
rename to doc/man7/crypto.pod
index 082f843..9dd0564 100644
--- a/doc/crypto/crypto.pod
+++ b/doc/man7/crypto.pod
@@ -1,7 +1,5 @@
 =pod
 
-=for comment openssl_manual_section:7
-
 =head1 NAME
 
 crypto - OpenSSL cryptographic library
diff --git a/doc/crypto/ct.pod b/doc/man7/ct.pod
similarity index 96%
rename from doc/crypto/ct.pod
rename to doc/man7/ct.pod
index bdcda98..119899c 100644
--- a/doc/crypto/ct.pod
+++ b/doc/man7/ct.pod
@@ -1,7 +1,5 @@
 =pod
 
-=for comment openssl_manual_section:7
-
 =head1 NAME
 
 ct - Certificate Transparency
diff --git a/doc/crypto/des_modes.pod b/doc/man7/des_modes.pod
similarity index 98%
rename from doc/crypto/des_modes.pod
rename to doc/man7/des_modes.pod
index 5107b77..50871f6 100644
--- a/doc/crypto/des_modes.pod
+++ b/doc/man7/des_modes.pod
@@ -1,7 +1,5 @@
 =pod
 
-=for comment openssl_manual_section:7
-
 =head1 NAME
 
 des_modes - the variants of DES and other crypto algorithms of OpenSSL
diff --git a/doc/crypto/evp.pod b/doc/man7/evp.pod
similarity index 98%
rename from doc/crypto/evp.pod
rename to doc/man7/evp.pod
index 31f4590..c930e7d 100644
--- a/doc/crypto/evp.pod
+++ b/doc/man7/evp.pod
@@ -1,7 +1,5 @@
 =pod
 
-=for comment openssl_manual_section:7
-
 =head1 NAME
 
 evp - high-level cryptographic functions
diff --git a/doc/ssl/ssl.pod b/doc/man7/ssl.pod
similarity index 99%
rename from doc/ssl/ssl.pod
rename to doc/man7/ssl.pod
index 582a276..b67edbc 100644
--- a/doc/ssl/ssl.pod
+++ b/doc/man7/ssl.pod
@@ -1,7 +1,5 @@
 =pod
 
-=for comment openssl_manual_section:7
-
 =head1 NAME
 
 SSL - OpenSSL SSL/TLS library
diff --git a/doc/crypto/x509.pod b/doc/man7/x509.pod
similarity index 97%
rename from doc/crypto/x509.pod
rename to doc/man7/x509.pod
index 8319b15..a8969de 100644
--- a/doc/crypto/x509.pod
+++ b/doc/man7/x509.pod
@@ -1,7 +1,5 @@
 =pod
 
-=for comment openssl_manual_section:7
-
 =head1 NAME
 
 x509 - X.509 certificate handling
diff --git a/util/find-doc-nits.pl b/util/find-doc-nits.pl
index d9d16d6..9d73c99 100755
--- a/util/find-doc-nits.pl
+++ b/util/find-doc-nits.pl
@@ -26,10 +26,6 @@
       3      => [ 'SYNOPSIS', 'RETURN\s+VALUES' ],
       5      => [ ],
       7      => [ ] );
-my %default_sections =
-    ( apps   => 1,
-      crypto => 3,
-      ssl    => 3 );
 
 # Cross-check functions in the NAME and SYNOPSIS section.
 sub name_synopsis()
@@ -112,8 +108,7 @@
 
     &name_synopsis($id, $filename, $contents)
         unless $contents =~ /=for comment generic/
-            or $contents =~ /=for comment openssl_manual_section:7/
-            or $filename =~ m@/apps/@;
+            or $filename =~ m@man[157]/@;
 
     print "$id doesn't start with =pod\n"
         if $contents !~ /^=pod/;
@@ -156,10 +151,8 @@
 
     # Find what section this page is in.  If run from "." assume
     # section 3.
-    my $section = $default_sections{$dirname} || 3;
-    if ($contents =~ /^=for\s+comment\s+openssl_manual_section:\s*(\d+)\s*$/m) {
-        $section = $1;
-    }
+    my $section = 3;
+    $section = $1 if $dirname =~ /man([1-9])/;
 
     foreach ((@{$mandatory_sections{'*'}}, @{$mandatory_sections{$section}})) {
         print "$id doesn't have a head1 section matching $_\n"
diff --git a/util/find-undoc-api.pl b/util/find-undoc-api.pl
index 7b2cb97..585ccc4 100755
--- a/util/find-undoc-api.pl
+++ b/util/find-undoc-api.pl
@@ -44,13 +44,11 @@
     my %return;
 
     foreach my $pod ( glob("$dir/*.pod") ) {
-        next if $pod eq 'doc/crypto/crypto.pod';
-        next if $pod eq 'doc/ssl/ssl.pod';
         my %podinfo = extract_pod_info($pod);
         foreach my $n ( @{$podinfo{names}} ) {
             $return{$n} = $pod;
             print "# Duplicate $n in $pod and $dups{$n}\n"
-                if defined $dups{$n};
+                if defined $dups{$n} && $dups{$n} ne $pod;
             $dups{$n} = $pod;
         }
     }
@@ -58,11 +56,11 @@
     return %return;
 }
 
+my %docced = &getdocced('doc/man3');
+
 sub printem()
 {
-    my $docdir = shift;
     my $numfile = shift;
-    my %docced = &getdocced($docdir);
     my $count = 0;
 
     foreach my $func ( &parsenum($numfile) ) {
@@ -77,6 +75,5 @@
     print "# Found $count missing from $numfile\n\n";
 }
 
-
-&printem('doc/crypto', 'util/libcrypto.num');
-&printem('doc/ssl', 'util/libssl.num');
+&printem('util/libcrypto.num');
+&printem('util/libssl.num');
diff --git a/util/perl/OpenSSL/Util/Pod.pm b/util/perl/OpenSSL/Util/Pod.pm
index 5c0af95..9f76fbf 100644
--- a/util/perl/OpenSSL/Util/Pod.pm
+++ b/util/perl/OpenSSL/Util/Pod.pm
@@ -53,11 +53,8 @@
 
 =item B<section =E<gt> N>
 
-The value MUST be a number, and will be the default man section number
-to be used with the given .pod file.  This number can be altered if
-the .pod file has a line like this:
-
-  =for comment openssl_manual_section: 4
+The value MUST be a number, and will be the man section number
+to be used with the given .pod file.
 
 =item B<debug =E<gt> 0|1>
 
@@ -109,12 +106,6 @@
     my %podinfo = ( section => $defaults{section});
     while(<$input>) {
         s|\R$||;
-        if (m|^=for\s+comment\s+openssl_manual_section:\s*([0-9])\s*$|) {
-            print STDERR "DEBUG: Found man section number $1\n"
-                if $defaults{debug};
-            $podinfo{section} = $1;
-        }
-
         # Stop reading when we have reached past the NAME section.
         last if (m|^=head1|
                  && defined $podinfo{lastsect}
diff --git a/util/process_docs.pl b/util/process_docs.pl
index 8b8de81..2c54f02 100644
--- a/util/process_docs.pl
+++ b/util/process_docs.pl
@@ -28,26 +28,23 @@
 my %options = ();
 GetOptions(\%options,
            'sourcedir=s',       # Source directory
-           'subdir=s%',         # Subdirectories to look through,
+           'section=i@',        # Subdirectories to look through,
                                 # with associated section numbers
            'destdir=s',         # Destination directory
            #'in=s@',             # Explicit files to process (ignores sourcedir)
-           #'section=i',         # Default section used for --in files
            'type=s',            # The result type, 'man' or 'html'
            'remove',            # To remove files rather than writing them
            'dry-run|n',         # Only output file names on STDOUT
            'debug|D+',
           );
 
-unless ($options{subdir}) {
-    $options{subdir} = { apps   => '1',
-                         crypto => '3',
-                         ssl    => '3' };
+unless ($options{section}) {
+    $options{section} = [ 1, 3, 5, 7 ];
 }
 unless ($options{sourcedir}) {
     $options{sourcedir} = catdir($config{sourcedir}, "doc");
 }
-pod2usage(1) unless ( defined $options{subdir}
+pod2usage(1) unless ( defined $options{section}
                       && defined $options{sourcedir}
                       && defined $options{destdir}
                       && defined $options{type}
@@ -62,8 +59,8 @@
         if defined $options{destdir};
     print STDERR "DEBUG:   --type      = $options{type}\n"
         if defined $options{type};
-    foreach (keys %{$options{subdir}}) {
-        print STDERR "DEBUG:   --subdir    = $_=$options{subdir}->{$_}\n";
+    foreach (sort @{$options{section}}) {
+        print STDERR "DEBUG:   --section   = $_\n";
     }
     print STDERR "DEBUG:   --remove    = $options{remove}\n"
         if defined $options{remove};
@@ -75,8 +72,8 @@
 
 my $symlink_exists = eval { symlink("",""); 1 };
 
-foreach my $subdir (keys %{$options{subdir}}) {
-    my $section = $options{subdir}->{$subdir};
+foreach my $section (sort @{$options{section}}) {
+    my $subdir = "man$section";
     my $podsourcedir = catfile($options{sourcedir}, $subdir);
     my $podglob = catfile($podsourcedir, "*.pod");