diff --git a/po4a/.gitignore b/po4a/.gitignore
index 5bcfa04b..735f9fd1 100644
--- a/po4a/.gitignore
+++ b/po4a/.gitignore
@@ -1,2 +1,3 @@
 /man
 /xz-man.pot
+/*.po.authors
diff --git a/po4a/po4a.conf b/po4a/po4a.conf
index 84c688c4..b3eea576 100644
--- a/po4a/po4a.conf
+++ b/po4a/po4a.conf
@@ -7,10 +7,10 @@
 [po4a_langs] de fr ko pt_BR ro uk
 [po4a_paths] xz-man.pot $lang:$lang.po
 
-[type: man] ../src/xz/xz.1              $lang:man/$lang/xz.1
-[type: man] ../src/xzdec/xzdec.1        $lang:man/$lang/xzdec.1
-[type: man] ../src/lzmainfo/lzmainfo.1  $lang:man/$lang/lzmainfo.1
-[type: man] ../src/scripts/xzdiff.1     $lang:man/$lang/xzdiff.1
-[type: man] ../src/scripts/xzgrep.1     $lang:man/$lang/xzgrep.1
-[type: man] ../src/scripts/xzless.1     $lang:man/$lang/xzless.1
-[type: man] ../src/scripts/xzmore.1     $lang:man/$lang/xzmore.1
+[type: man] ../src/xz/xz.1              $lang:man/$lang/xz.1        add_$lang:?$lang.po.authors
+[type: man] ../src/xzdec/xzdec.1        $lang:man/$lang/xzdec.1     add_$lang:?$lang.po.authors
+[type: man] ../src/lzmainfo/lzmainfo.1  $lang:man/$lang/lzmainfo.1  add_$lang:?$lang.po.authors
+[type: man] ../src/scripts/xzdiff.1     $lang:man/$lang/xzdiff.1    add_$lang:?$lang.po.authors
+[type: man] ../src/scripts/xzgrep.1     $lang:man/$lang/xzgrep.1    add_$lang:?$lang.po.authors
+[type: man] ../src/scripts/xzless.1     $lang:man/$lang/xzless.1    add_$lang:?$lang.po.authors
+[type: man] ../src/scripts/xzmore.1     $lang:man/$lang/xzmore.1    add_$lang:?$lang.po.authors
diff --git a/po4a/update-po b/po4a/update-po
index 244951ec..2104503f 100755
--- a/po4a/update-po
+++ b/po4a/update-po
@@ -31,6 +31,24 @@ fi
 
 PACKAGE_VERSION=`cd .. && sh build-aux/version.sh` || exit 1
 
+# Put the author info from the .po files into the header comment of
+# the generated man pages.
+for FILE in *.po
+do
+	printf '%s\n.\\"\n' \
+'PO4A-HEADER: position=^\.\\" Author; mode=after; beginboundary=^\.\\"$' \
+		> "$FILE.authors"
+	sed '
+		/^[^#]/,$d
+		/: 0BSD$/d
+		/BSD Zero Clause License/d
+		/distributed under the same license/d
+		/in the public domain/d
+		/^#$/d
+		s/^#/.\\"/
+		' "$FILE" >> "$FILE.authors"
+done
+
 # Using --force to get up-to-date version numbers in the output files
 # when nothing else has changed. This makes it slower but it's fine
 # as long as this isn't run every time when "make" is run at the