diff --git a/build.info b/build.info
index 44ecee35cb..27818b7fce 100644
--- a/build.info
+++ b/build.info
@@ -68,7 +68,6 @@ GENERATE[include/openssl/x509v3.h]=include/openssl/x509v3.h.in
 GENERATE[include/openssl/x509_vfy.h]=include/openssl/x509_vfy.h.in
 GENERATE[include/crypto/bn_conf.h]=include/crypto/bn_conf.h.in
 GENERATE[include/crypto/dso_conf.h]=include/crypto/dso_conf.h.in
-GENERATE[doc/man7/openssl_user_macros.pod]=doc/man7/openssl_user_macros.pod.in
 
 IF[{- defined $target{shared_defflag} -}]
   SHARED_SOURCE[libcrypto]=libcrypto.ld
diff --git a/doc/man1/build.info b/doc/man1/build.info
index 40df5d360e..6d9d7b564c 100644
--- a/doc/man1/build.info
+++ b/doc/man1/build.info
@@ -108,56 +108,5 @@ DEPEND[openssl-verify.pod]=../perlvars.pm
 DEPEND[openssl-version.pod]=../perlvars.pm
 DEPEND[openssl-x509.pod]=../perlvars.pm
 
-GENERATE[openssl-asn1parse.pod]=openssl-asn1parse.pod.in
-GENERATE[openssl-ca.pod]=openssl-ca.pod.in
-GENERATE[openssl-ciphers.pod]=openssl-ciphers.pod.in
-GENERATE[openssl-cmds.pod]=openssl-cmds.pod.in
-GENERATE[openssl-cmp.pod]=openssl-cmp.pod.in
-GENERATE[openssl-cms.pod]=openssl-cms.pod.in
-GENERATE[openssl-crl2pkcs7.pod]=openssl-crl2pkcs7.pod.in
-GENERATE[openssl-crl.pod]=openssl-crl.pod.in
-GENERATE[openssl-dgst.pod]=openssl-dgst.pod.in
-GENERATE[openssl-dhparam.pod]=openssl-dhparam.pod.in
-GENERATE[openssl-dsaparam.pod]=openssl-dsaparam.pod.in
-GENERATE[openssl-dsa.pod]=openssl-dsa.pod.in
-GENERATE[openssl-ecparam.pod]=openssl-ecparam.pod.in
-GENERATE[openssl-ec.pod]=openssl-ec.pod.in
-GENERATE[openssl-enc.pod]=openssl-enc.pod.in
-GENERATE[openssl-engine.pod]=openssl-engine.pod.in
-GENERATE[openssl-errstr.pod]=openssl-errstr.pod.in
-GENERATE[openssl-fipsinstall.pod]=openssl-fipsinstall.pod.in
-GENERATE[openssl-gendsa.pod]=openssl-gendsa.pod.in
-GENERATE[openssl-genpkey.pod]=openssl-genpkey.pod.in
-GENERATE[openssl-genrsa.pod]=openssl-genrsa.pod.in
-GENERATE[openssl-info.pod]=openssl-info.pod.in
-GENERATE[openssl-kdf.pod]=openssl-kdf.pod.in
-GENERATE[openssl-list.pod]=openssl-list.pod.in
-GENERATE[openssl-mac.pod]=openssl-mac.pod.in
-GENERATE[openssl-nseq.pod]=openssl-nseq.pod.in
-GENERATE[openssl-ocsp.pod]=openssl-ocsp.pod.in
-GENERATE[openssl-passwd.pod]=openssl-passwd.pod.in
-GENERATE[openssl-pkcs12.pod]=openssl-pkcs12.pod.in
-GENERATE[openssl-pkcs7.pod]=openssl-pkcs7.pod.in
-GENERATE[openssl-pkcs8.pod]=openssl-pkcs8.pod.in
-GENERATE[openssl-pkeyparam.pod]=openssl-pkeyparam.pod.in
-GENERATE[openssl-pkey.pod]=openssl-pkey.pod.in
-GENERATE[openssl-pkeyutl.pod]=openssl-pkeyutl.pod.in
-GENERATE[openssl-prime.pod]=openssl-prime.pod.in
-GENERATE[openssl-rand.pod]=openssl-rand.pod.in
-GENERATE[openssl-rehash.pod]=openssl-rehash.pod.in
-GENERATE[openssl-req.pod]=openssl-req.pod.in
-GENERATE[openssl-rsa.pod]=openssl-rsa.pod.in
-GENERATE[openssl-rsautl.pod]=openssl-rsautl.pod.in
-GENERATE[openssl-s_client.pod]=openssl-s_client.pod.in
-GENERATE[openssl-sess_id.pod]=openssl-sess_id.pod.in
-GENERATE[openssl-smime.pod]=openssl-smime.pod.in
-GENERATE[openssl-speed.pod]=openssl-speed.pod.in
-GENERATE[openssl-spkac.pod]=openssl-spkac.pod.in
-GENERATE[openssl-srp.pod]=openssl-srp.pod.in
-GENERATE[openssl-s_server.pod]=openssl-s_server.pod.in
-GENERATE[openssl-s_time.pod]=openssl-s_time.pod.in
-GENERATE[openssl-storeutl.pod]=openssl-storeutl.pod.in
-GENERATE[openssl-ts.pod]=openssl-ts.pod.in
-GENERATE[openssl-verify.pod]=openssl-verify.pod.in
-GENERATE[openssl-version.pod]=openssl-version.pod.in
-GENERATE[openssl-x509.pod]=openssl-x509.pod.in
+# All .pod.in files are detected by build.info in the parent directory, and
+# turned into appropriate GENERATE lines.