diff --git a/Makefile.am b/Makefile.am
index 9d4403253e9..c306c6eea76 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -49,8 +49,7 @@ EXTRA_DIST = \
 	QUICKSTART \
 	README \
 	SPONSORS \
-	bootstrap.sh \
-	po4a.conf
+	bootstrap.sh
 
 install-pinger:
 	chown root $(DESTDIR)$(DEFAULT_PINGER)
diff --git a/doc/manuals/Makefile.am b/doc/manuals/Makefile.am
index d34b7458474..80559784a6f 100644
--- a/doc/manuals/Makefile.am
+++ b/doc/manuals/Makefile.am
@@ -12,4 +12,19 @@
 include $(srcdir)/language.am
 
 EXTRA_DIST = \
-	language.am
+	language.am \
+	manuals.conf
+
+DISTCLEANFILES = manuals.conf
+
+manuals.conf: Makefile
+	( \
+	  echo "[po4a_langs] $(LANGUAGE_FILES)" | sed -e 's%[.]lang%%g'; \
+	  echo -n "[options] --no-translations -o groff_code=verbatim "; \
+	  echo " --package-name=$(PACKAGE) --package-version=$(VERSION) "; \
+	  echo "[po4a_paths] doc/manuals/manuals.pot \$$lang:doc/manuals/\$$lang.po"; \
+	  for fname in `cd $(top_srcdir) ; git ls-files '*.8' '*.8.in'`; do \
+	    manp=`basename $${fname}`; \
+	    echo "[type: man] $${fname} \$$lang:doc/manuals/\$$lang/$${manp}"; \
+	  done \
+	) >$@
diff --git a/doc/po4a.cnf b/doc/po4a.cnf
deleted file mode 100644
index dc3ad96c44b..00000000000
--- a/doc/po4a.cnf
+++ /dev/null
@@ -1,3 +0,0 @@
-[po4a_langs] ar cs de en en_AU ru
-
-[po4a_paths] doc/manuals/manuals.pot $lang:doc/manuals/$lang.po
diff --git a/po4a.conf b/po4a.conf
deleted file mode 100644
index 0cd5fd3d2fc..00000000000
--- a/po4a.conf
+++ /dev/null
@@ -1,45 +0,0 @@
-[po4a_langs] ar cs de en en_AU ru
-
-[po4a_paths] doc/manuals/manuals.pot $lang:doc/manuals/$lang.po
-
-[type: man] src/acl/external/AD_group/ext_ad_group_acl.8 $lang:doc/manuals/$lang/ext_ad_group_acl.8
-
-[type: man] src/acl/external/eDirectory_userip/ext_edirectory_userip_acl.8 $lang:doc/manuals/$lang/ext_edirectory_userip_acl.8
-
-[type: man] src/acl/external/file_userip/ext_file_userip_acl.8 $lang:doc/manuals/$lang/ext_file_userip_acl.8
-
-[type: man] src/acl/external/kerberos_ldap_group/ext_kerberos_ldap_group_acl.8 $lang:doc/manuals/$lang/ext_kerberos_ldap_group_acl.8
-
-[type: man] src/acl/external/LDAP_group/ext_ldap_group_acl.8 $lang:doc/manuals/$lang/ext_ldap_group_acl.8
-
-[type: man] src/acl/external/session/ext_session_acl.8 $lang:doc/manuals/$lang/ext_session_acl.8
-
-[type: man] src/acl/external/time_quota/ext_time_quota_acl.8 $lang:doc/manuals/$lang/ext_time_quota_acl.8
-
-[type: man] src/acl/external/unix_group/ext_unix_group_acl.8 $lang:doc/manuals/$lang/ext_unix_group_acl.8
-
-[type: man] src/auth/basic/getpwnam/basic_getpwnam_auth.8 $lang:doc/manuals/$lang/basic_getpwnam_auth.8
-
-[type: man] src/auth/basic/LDAP/basic_ldap_auth.8 $lang:doc/manuals/$lang/basic_ldap_auth.8
-
-[type: man] src/auth/basic/NCSA/basic_ncsa_auth.8 $lang:doc/manuals/$lang/basic_ncsa_auth.8
-
-[type: man] src/auth/basic/PAM/basic_pam_auth.8 $lang:doc/manuals/$lang/basic_pam_auth.8
-
-[type: man] src/auth/basic/RADIUS/basic_radius_auth.8 $lang:doc/manuals/$lang/basic_radius_auth.8
-
-[type: man] src/auth/basic/SASL/basic_sasl_auth.8 $lang:doc/manuals/$lang/basic_sasl_auth.8
-
-[type: man] src/auth/basic/SSPI/basic_sspi_auth.8 $lang:doc/manuals/$lang/basic_sspi_auth.8
-
-[type: man] src/auth/digest/file/digest_file_auth.8 $lang:doc/manuals/$lang/digest_file_auth.8
-
-[type: man] src/auth/negotiate/kerberos/negotiate_kerberos_auth.8 $lang:doc/manuals/$lang/negotiate_kerberos_auth.8
-
-[type: man] src/auth/negotiate/SSPI/negotiate_sspi_auth.8 $lang:doc/manuals/$lang/negotiate_sspi_auth.8
-
-[type: man] src/security/cert_generators/file/security_file_certgen.8.in $lang:doc/manuals/$lang/security_file_certgen.8.in
-
-[type: man] src/squid.8.in $lang:doc/manuals/$lang/squid.8.in
-
-[type: man] tools/cachemgr.cgi.8.in $lang:doc/manuals/$lang/cachemgr.cgi.8.in
diff --git a/scripts/update-pot.sh b/scripts/update-pot.sh
index 587c00b9b9f..2155611c54e 100755
--- a/scripts/update-pot.sh
+++ b/scripts/update-pot.sh
@@ -64,31 +64,11 @@ cd ..
 
 ## begin doc/manuals updates
 
-# Build the po4a.conf
-cat doc/po4a.cnf >po4a.conf
-for f in `ls -1 \
-	src/*.8.in \
-	src/auth/*/*/*.8 \
-	src/acl/external/*/*.8 \
-	src/http/url_rewriters/*/*.8 \
-	src/log/*/*.8 \
-	src/security/*/*/*.8 \
-	src/security/*/*/*.8.in \
-	src/src/store/id_rewriters/*/*.8 \
-	tools/*/*.1 \
-	tools/*.8.in \
-` ; do
-	echo "" >>po4a.conf
-	manp=`basename ${f}`
-	echo "[type: man] ${f} \$lang:doc/manuals/\$lang/${manp}" >>po4a.conf
-done
-
 ## po4a conversion of all doc/manuals man files...
-po4a --no-translations -o groff_code=verbatim --verbose po4a.conf
+po4a --verbose doc/manuals/manuals.conf
 
 (
 	cat doc/manuals/manuals.pot |
-	sed s/PACKAGE\ VERSION/Squid-5/ |
 	sed s/LANGUAGE\ \<LL\@li\.org\>/Squid\ Developers\ \<squid-dev\@lists.squid-cache\.org\>/
 ) >doc/manuals/manuals.pot.tmp
 mv doc/manuals/manuals.pot.tmp doc/manuals/manuals.pot