gnu/help2man

diff --git a/README b/README
index 1be7c6b..217d444 100644
--- a/README
+++ b/README
@@ -1,10 +1,10 @@
-		README for GNU help2man version 1.39.2
+		README for GNU help2man version 1.39.3
 
 help2man is a script to create simple man pages from the --help and
 --version output of programs.
 
   http://www.gnu.org/software/help2man/
-  ftp://ftp.gnu.org/gnu/help2man/help2man-1.39.2.tar.gz
+  ftp://ftp.gnu.org/gnu/help2man/help2man-1.39.3.tar.gz
 
   git://git.debian.org/users/bod/help2man.git
   http://git.debian.org/?p=users/bod/help2man.git
diff --git a/THANKS b/THANKS
index ca4fb3b..3215fa2 100644
--- a/THANKS
+++ b/THANKS
@@ -22,6 +22,7 @@ Yuri Kozlov			<yuray@komyakino.ru>
 Matt Kraai			<kraai@alumni.carnegiemellon.edu>
 Helge Kreutzmann		<debian@helgefjell.de>
 Chris Leick			<c.leick@vollbio.de>
+Werner Lemberg			<wl@gnu.org>
 Lionel Elie Mamane		<lionel@mamane.lu>
 Jim Meyering			<jim@meyering.net>
 Dave Morrison			<dave@bnl.gov>
diff --git a/configure b/configure
index 5d7c804..a2d71d5 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.67.
+# Generated by GNU Autoconf 2.68.
 #
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -89,6 +89,7 @@ fi
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
+as_myself=
 case $0 in #((
   *[\\/]* ) as_myself=$0 ;;
   *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -213,11 +214,18 @@ IFS=$as_save_IFS
   # We cannot yet assume a decent shell, so we have to provide a
 	# neutralization value for shells without unset; and this also
 	# works around shells that cannot unset nonexistent variables.
+	# Preserve -v and -x to the replacement shell.
 	BASH_ENV=/dev/null
 	ENV=/dev/null
 	(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
 	export CONFIG_SHELL
-	exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
+	case $- in # ((((
+	  *v*x* | *x*v* ) as_opts=-vx ;;
+	  *v* ) as_opts=-v ;;
+	  *x* ) as_opts=-x ;;
+	  * ) as_opts= ;;
+	esac
+	exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
 fi
 
     if test x$as_have_required = xno; then :
@@ -1028,7 +1036,7 @@ Try \`$0 --help' for more information"
     $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
     expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
       $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
-    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
+    : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
     ;;
 
   esac
@@ -1311,7 +1319,7 @@ test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
 configure
-generated by GNU Autoconf 2.67
+generated by GNU Autoconf 2.68
 
 Copyright (C) 2010 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
@@ -1357,7 +1365,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_retval=1
 fi
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   as_fn_set_status $ac_retval
 
 } # ac_fn_c_try_compile
@@ -1403,7 +1411,7 @@ fi
   # interfere with the next link command; also delete a directory that is
   # left behind by Apple's compiler.  We do this before executing the actions.
   rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   as_fn_set_status $ac_retval
 
 } # ac_fn_c_try_link
@@ -1412,7 +1420,7 @@ This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
 It was created by $as_me, which was
-generated by GNU Autoconf 2.67.  Invocation command line was
+generated by GNU Autoconf 2.68.  Invocation command line was
 
   $ $0 $@
 
@@ -1670,7 +1678,7 @@ $as_echo "$as_me: loading site script $ac_site_file" >&6;}
       || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "failed to load site script $ac_site_file
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
   fi
 done
 
@@ -1762,10 +1770,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 # find perl binary
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for perl" >&5
 $as_echo_n "checking for perl... " >&6; }
-if test "${ac_cv_prog_PERL+set}" = set; then :
+if ${ac_cv_prog_PERL+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  echo "configure:1768: ...version 5.008 required" >&5
+  echo "configure:1776: ...version 5.008 required" >&5
   # allow user to override
   if test -n "$PERL"; then
     ac_try="$PERL"
@@ -1774,7 +1782,7 @@ else
   fi
 
   for ac_prog in $ac_try; do
-    echo "configure:1777: trying $ac_prog" >&5
+    echo "configure:1785: trying $ac_prog" >&5
     if ($ac_prog -e 'printf "found version %g\n",$] ;exit($]<5.008)') 1>&5 2>&1; then
       ac_cv_prog_PERL=$ac_prog
       break
@@ -1795,7 +1803,7 @@ test -z "$PERL" && as_fn_error $? "perl 5.8 required" "$LINENO" 5
 # check module exists
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for module Locale::gettext" >&5
 $as_echo_n "checking for module Locale::gettext... " >&6; }
-if test "${ac_cv_module_Locale__gettext+set}" = set; then :
+if ${ac_cv_module_Locale__gettext+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if ($PERL -mLocale::gettext -e 1) 1>&5 2>&1; then
@@ -1812,7 +1820,7 @@ $as_echo "$ac_cv_module_Locale__gettext" >&6; }
 set dummy msgfmt; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_MSGFMT+set}" = set; then :
+if ${ac_cv_path_MSGFMT+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $MSGFMT in
@@ -1859,7 +1867,7 @@ if test -n "$ac_tool_prefix"; then
 set dummy ${ac_tool_prefix}gcc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -1899,7 +1907,7 @@ if test -z "$ac_cv_prog_CC"; then
 set dummy gcc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
@@ -1952,7 +1960,7 @@ if test -z "$CC"; then
 set dummy ${ac_tool_prefix}cc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -1992,7 +2000,7 @@ if test -z "$CC"; then
 set dummy cc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -2051,7 +2059,7 @@ if test -z "$CC"; then
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -2095,7 +2103,7 @@ do
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
@@ -2150,7 +2158,7 @@ fi
 test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "no acceptable C compiler found in \$PATH
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
 
 # Provide some information about the compiler.
 $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
@@ -2265,7 +2273,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error 77 "C compiler cannot create executables
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
@@ -2308,7 +2316,7 @@ else
   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
 fi
 rm -f conftest conftest$ac_cv_exeext
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
@@ -2367,7 +2375,7 @@ $as_echo "$ac_try_echo"; } >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "cannot run C compiled programs.
 If you meant to cross compile, use \`--host'.
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
     fi
   fi
 fi
@@ -2378,7 +2386,7 @@ rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
 ac_clean_files=$ac_clean_files_save
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
 $as_echo_n "checking for suffix of object files... " >&6; }
-if test "${ac_cv_objext+set}" = set; then :
+if ${ac_cv_objext+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -2419,7 +2427,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "cannot compute suffix of object files: cannot compile
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
 fi
 rm -f conftest.$ac_cv_objext conftest.$ac_ext
 fi
@@ -2429,7 +2437,7 @@ OBJEXT=$ac_cv_objext
 ac_objext=$OBJEXT
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
 $as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
-if test "${ac_cv_c_compiler_gnu+set}" = set; then :
+if ${ac_cv_c_compiler_gnu+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -2466,7 +2474,7 @@ ac_test_CFLAGS=${CFLAGS+set}
 ac_save_CFLAGS=$CFLAGS
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
 $as_echo_n "checking whether $CC accepts -g... " >&6; }
-if test "${ac_cv_prog_cc_g+set}" = set; then :
+if ${ac_cv_prog_cc_g+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_save_c_werror_flag=$ac_c_werror_flag
@@ -2544,7 +2552,7 @@ else
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
 $as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
-if test "${ac_cv_prog_cc_c89+set}" = set; then :
+if ${ac_cv_prog_cc_c89+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_cv_prog_cc_c89=no
@@ -2642,7 +2650,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing dlsym" >&5
 $as_echo_n "checking for library containing dlsym... " >&6; }
-if test "${ac_cv_search_dlsym+set}" = set; then :
+if ${ac_cv_search_dlsym+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_func_search_save_LIBS=$LIBS
@@ -2676,11 +2684,11 @@ for ac_lib in '' dl; do
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext
-  if test "${ac_cv_search_dlsym+set}" = set; then :
+  if ${ac_cv_search_dlsym+:} false; then :
   break
 fi
 done
-if test "${ac_cv_search_dlsym+set}" = set; then :
+if ${ac_cv_search_dlsym+:} false; then :
 
 else
   ac_cv_search_dlsym=no
@@ -2698,7 +2706,7 @@ fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing bindtextdomain" >&5
 $as_echo_n "checking for library containing bindtextdomain... " >&6; }
-if test "${ac_cv_search_bindtextdomain+set}" = set; then :
+if ${ac_cv_search_bindtextdomain+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_func_search_save_LIBS=$LIBS
@@ -2732,11 +2740,11 @@ for ac_lib in '' intl; do
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext
-  if test "${ac_cv_search_bindtextdomain+set}" = set; then :
+  if ${ac_cv_search_bindtextdomain+:} false; then :
   break
 fi
 done
-if test "${ac_cv_search_bindtextdomain+set}" = set; then :
+if ${ac_cv_search_bindtextdomain+:} false; then :
 
 else
   ac_cv_search_bindtextdomain=no
@@ -2838,7 +2846,7 @@ ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
 $as_echo_n "checking for a BSD-compatible install... " >&6; }
 if test -z "$INSTALL"; then
-if test "${ac_cv_path_install+set}" = set; then :
+if ${ac_cv_path_install+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -2918,7 +2926,7 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 set dummy makeinfo; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_MAKEINFO+set}" = set; then :
+if ${ac_cv_path_MAKEINFO+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $MAKEINFO in
@@ -2959,7 +2967,7 @@ fi
 set dummy install-info; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_INSTALL_INFO+set}" = set; then :
+if ${ac_cv_path_INSTALL_INFO+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $INSTALL_INFO in
@@ -3062,10 +3070,21 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
      :end' >>confcache
 if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
   if test -w "$cache_file"; then
-    test "x$cache_file" != "x/dev/null" &&
+    if test "x$cache_file" != "x/dev/null"; then
       { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
 $as_echo "$as_me: updating cache $cache_file" >&6;}
-    cat confcache >$cache_file
+      if test ! -f "$cache_file" || test -h "$cache_file"; then
+	cat confcache >"$cache_file"
+      else
+        case $cache_file in #(
+        */* | ?:*)
+	  mv -f confcache "$cache_file"$$ &&
+	  mv -f "$cache_file"$$ "$cache_file" ;; #(
+        *)
+	  mv -f confcache "$cache_file" ;;
+	esac
+      fi
+    fi
   else
     { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
 $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
@@ -3133,7 +3152,7 @@ LTLIBOBJS=$ac_ltlibobjs
 
 
 
-: ${CONFIG_STATUS=./config.status}
+: "${CONFIG_STATUS=./config.status}"
 ac_write_fail=0
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
@@ -3234,6 +3253,7 @@ fi
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
+as_myself=
 case $0 in #((
   *[\\/]* ) as_myself=$0 ;;
   *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -3541,7 +3561,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # values after options handling.
 ac_log="
 This file was extended by $as_me, which was
-generated by GNU Autoconf 2.67.  Invocation command line was
+generated by GNU Autoconf 2.68.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -3594,7 +3614,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
 config.status
-configured by $0, generated by GNU Autoconf 2.67,
+configured by $0, generated by GNU Autoconf 2.68,
   with options \\"\$ac_cs_config\\"
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -3706,7 +3726,7 @@ do
   case $ac_config_target in
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
 
-  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;;
+  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
   esac
 done
 
@@ -3727,9 +3747,10 @@ fi
 # after its creation but before its name has been assigned to `$tmp'.
 $debug ||
 {
-  tmp=
+  tmp= ac_tmp=
   trap 'exit_status=$?
-  { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
+  : "${ac_tmp:=$tmp}"
+  { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status
 ' 0
   trap 'as_fn_exit 1' 1 2 13 15
 }
@@ -3737,12 +3758,13 @@ $debug ||
 
 {
   tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
-  test -n "$tmp" && test -d "$tmp"
+  test -d "$tmp"
 }  ||
 {
   tmp=./conf$$-$RANDOM
   (umask 077 && mkdir "$tmp")
 } || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
+ac_tmp=$tmp
 
 # Set up the scripts for CONFIG_FILES section.
 # No need to generate them if there are no CONFIG_FILES.
@@ -3764,7 +3786,7 @@ else
   ac_cs_awk_cr=$ac_cr
 fi
 
-echo 'BEGIN {' >"$tmp/subs1.awk" &&
+echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
 _ACEOF
 
 
@@ -3792,7 +3814,7 @@ done
 rm -f conf$$subs.sh
 
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
+cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
 _ACEOF
 sed -n '
 h
@@ -3840,7 +3862,7 @@ t delim
 rm -f conf$$subs.awk
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 _ACAWK
-cat >>"\$tmp/subs1.awk" <<_ACAWK &&
+cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
   for (key in S) S_is_set[key] = 1
   FS = ""
 
@@ -3872,7 +3894,7 @@ if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
   sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
 else
   cat
-fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
+fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \
   || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
 _ACEOF
 
@@ -3912,7 +3934,7 @@ do
   esac
   case $ac_mode$ac_tag in
   :[FHL]*:*);;
-  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;;
+  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
   :[FH]-) ac_tag=-:-;;
   :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
   esac
@@ -3931,7 +3953,7 @@ do
     for ac_f
     do
       case $ac_f in
-      -) ac_f="$tmp/stdin";;
+      -) ac_f="$ac_tmp/stdin";;
       *) # Look for the file first in the build tree, then in the source tree
 	 # (if the path is not absolute).  The absolute path cannot be DOS-style,
 	 # because $ac_f cannot contain `:'.
@@ -3940,7 +3962,7 @@ do
 	   [\\/$]*) false;;
 	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
 	   esac ||
-	   as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;;
+	   as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
       esac
       case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
       as_fn_append ac_file_inputs " '$ac_f'"
@@ -3966,8 +3988,8 @@ $as_echo "$as_me: creating $ac_file" >&6;}
     esac
 
     case $ac_tag in
-    *:-:* | *:-) cat >"$tmp/stdin" \
-      || as_fn_error $? "could not create $ac_file" "$LINENO" 5  ;;
+    *:-:* | *:-) cat >"$ac_tmp/stdin" \
+      || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
     esac
     ;;
   esac
@@ -4097,21 +4119,22 @@ s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
 s&@INSTALL@&$ac_INSTALL&;t t
 $ac_datarootdir_hack
 "
-eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
-  || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \
+  >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5
 
 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
-  { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
-  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
+  { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
+  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' \
+      "$ac_tmp/out"`; test -z "$ac_out"; } &&
   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
 which seems to be undefined.  Please make sure it is defined" >&5
 $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
 which seems to be undefined.  Please make sure it is defined" >&2;}
 
-  rm -f "$tmp/stdin"
+  rm -f "$ac_tmp/stdin"
   case $ac_file in
-  -) cat "$tmp/out" && rm -f "$tmp/out";;
-  *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
+  -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";;
+  *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";;
   esac \
   || as_fn_error $? "could not create $ac_file" "$LINENO" 5
  ;;
diff --git a/debian/changelog b/debian/changelog
index dd5bf1c..689b835 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+help2man (1.39.3) unstable; urgency=low
+
+  * Update French translation (thanks to David Prévot, closes: #620250).
+  * Update the "Localised man pages" section of the Texinfo docs and note that
+    translations are now handled through the Translation Project.
+  * Update German translation (thanks to Chris Leick, closes: #624401).
+  * Minor update to German translation as suggested by Werner Lemberg in
+    http://sourceforge.net/mailarchive/message.php?msg_id=26828512
+
+ -- Brendan O'Dea <bod@debian.org>  Sun, 01 May 2011 10:35:38 +1000
+
 help2man (1.39.2) unstable; urgency=low
 
   * Update Russian translation (thanks to Yuri Kozlov).
diff --git a/help2man.1 b/help2man.1
index 05a86aa..4c30a3a 100644
--- a/help2man.1
+++ b/help2man.1
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.39.2.
-.TH HELP2MAN "1" "March 2011" "help2man 1.39.2" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.39.3.
+.TH HELP2MAN "1" "May 2011" "help2man 1.39.3" "User Commands"
 .SH NAME
 help2man \- generate a simple manual page
 .SH SYNOPSIS
diff --git a/help2man.PL b/help2man.PL
index 5150534..75da9e2 100755
--- a/help2man.PL
+++ b/help2man.PL
@@ -16,7 +16,7 @@ use 5.008;
 use Config;
 use Getopt::Long;
 
-my ($program, $version) = ('help2man', '1.39.2');
+my ($program, $version) = ('help2man', '1.39.3');
 
 my %opts;
 die "Usage: $0 [--quiet] [--stdout] [--with-gettext] [--name] [--version]\n"
diff --git a/help2man.de.1 b/help2man.de.1
index 86e234f..ce7b42a 100644
--- a/help2man.de.1
+++ b/help2man.de.1
@@ -1,67 +1,70 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.39.2.
-.TH HELP2MAN "1" "März 2011" "help2man 1.39.2" "Benutzerkommandos"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.39.3.
+.TH HELP2MAN "1" "Mai 2011" "help2man 1.39.3" "Benutzerkommandos"
 .SH NAME
 help2man \- generiert eine einfache Handbuchseite
+.SH ÜBERSICHT
+.B help2man
+[\fIOPTION\fR]... \fIPROGRAMM\fR
 .SH BESCHREIBUNG
-`help2man' generates a man page out of `\-\-help' and `\-\-version' output.
-.PP
-Usage: help2man [OPTION]... EXECUTABLE
+»help2man« generiert aus der Ausgabe von »\-\-help« und »\-\-version« eine
+Handbuchseite.
 .TP
-\fB\-n\fR, \fB\-\-name\fR=\fISTRING\fR
-description for the NAME paragraph
+\fB\-n\fR, \fB\-\-name\fR=\fIZEICHENKETTE\fR
+Beschreibung für den NAME\-Abschnitt
 .TP
-\fB\-s\fR, \fB\-\-section\fR=\fISECTION\fR
-section number for manual page (1, 6, 8)
+\fB\-s\fR, \fB\-\-section\fR=\fIABSCHNITT\fR
+Abschnittsnummer der Handbuchseite (1, 6, 8)
 .TP
 \fB\-m\fR, \fB\-\-manual\fR=\fITEXT\fR
-name of manual (User Commands, ...)
+Name des Handbuchs (Anwenderbefehle, ...)
 .TP
 \fB\-S\fR, \fB\-\-source\fR=\fITEXT\fR
-source of program (FSF, Debian, ...)
+Quelle des Programms (FSF, Debian, ...)
 .TP
-\fB\-L\fR, \fB\-\-locale\fR=\fISTRING\fR
-select locale (default "C")
+\fB\-L\fR, \fB\-\-locale\fR=\fIZEICHENKETTE\fR
+Locale auswählen (Vorgabe »C«)
 .TP
-\fB\-i\fR, \fB\-\-include\fR=\fIFILE\fR
-include material from `FILE'
+\fB\-i\fR, \fB\-\-include\fR=\fIDATEI\fR
+Material aus »DATEI« einbinden
 .TP
-\fB\-I\fR, \fB\-\-opt\-include\fR=\fIFILE\fR
-include material from `FILE' if it exists
+\fB\-I\fR, \fB\-\-opt\-include\fR=\fIDATEI\fR
+Material aus »DATEI« einbinden, wenn es
+existiert
 .TP
-\fB\-o\fR, \fB\-\-output\fR=\fIFILE\fR
-send output to `FILE'
+\fB\-o\fR, \fB\-\-output\fR=\fIDATEI\fR
+in »DATEI« ausgeben
 .TP
-\fB\-p\fR, \fB\-\-info\-page\fR=\fITEXT\fR
-name of Texinfo manual
+\fB\-p\fR, \fB\-\-info\-page\fR=\fIDATEI\fR
+Name des Texinfo\-Handbuchs
 .TP
 \fB\-N\fR, \fB\-\-no\-info\fR
-suppress pointer to Texinfo manual
+Verweis auf Texinfo\-Handbuch unterdrücken
 .TP
 \fB\-l\fR, \fB\-\-libtool\fR
-exclude the `lt\-' from the program name
+das »lt\-« aus dem Programmnamen ausschließen
 .TP
 \fB\-\-help\fR
-print this help, then exit
+diese Hilfe anzeigen, dann beenden
 .TP
 \fB\-\-version\fR
-print version number, then exit
+Versionsnummer anzeigen, dann beenden
 .PP
-EXECUTABLE should accept `\-\-help' and `\-\-version' options and produce output on
-stdout although alternatives may be specified using:
+PROGRAMM sollte »\-\-help«\- und »\-\-version«\-Optionen
+akzeptieren und eine Ausgabe auf der Standardausgabe (stdout) erzeugen,
+aber es können auch Alternativen angegeben werden:
 .TP
-\fB\-h\fR, \fB\-\-help\-option\fR=\fISTRING\fR
-help option string
+\fB\-h\fR, \fB\-\-help\-option\fR=\fIZEICHENKETTE\fR
+Hilfeoptionzeichenkette
 .TP
-\fB\-v\fR, \fB\-\-version\-option\fR=\fISTRING\fR
-version option string
+\fB\-v\fR, \fB\-\-version\-option\fR=\fIZEICHENKETTE\fR
+Versionsoptionzeichenkette
 .TP
-\fB\-\-version\-string\fR=\fISTRING\fR
-version string
+\fB\-\-version\-string\fR=\fIZEICHENKETTE\fR
+Versionszeichenkette
 .TP
 \fB\-\-no\-discard\-stderr\fR
-include stderr when parsing option output
-.PP
-Report bugs to <bug\-help2man@gnu.org>.
+Standardfehlerausgabe (stderr) bei der
+Optionenanalyse einschließen
 .SH "DATEIEN ZUM EINFÜGEN"
 Zusätzliches Material kann in die generierte Ausgabe mit den
 .B \-\-include
@@ -96,14 +99,14 @@ werden als Optionen behandelt. Alles andere wird stillschweigend
 ignoriert und könnte für Kommentare, RCS-Schlüsselwörter oder was
 Sie wollen benutzt werden.
 
-Die Reihenfolge in der die Abschnitte ausgegeben werden, ist:
+Die Reihenfolge, in der die Abschnitte ausgegeben werden, ist:
 
     NAME
     ÜBERSICHT
     BESCHREIBUNG
     OPTIONEN
-    ENVIRONMENT
-    FILES
+    UMGEBUNG
+    DATEIEN
     BEISPIELE
     \fIandere\fR
     AUTOR
@@ -130,13 +133,17 @@ vorgefunden werden, eingefügt.
 Die neuste Version dieser Distribution ist Online erhältlich von:
 
     ftp://ftp.gnu.org/gnu/help2man/
+.SH AUTOR
+Geschrieben von Brendan O'Dea <bod@debian.org>
+.SH FEHLERBERICHTE
+Berichten Sie Fehler an <bug\-help2man@gnu.org>.
 .SH COPYRIGHT
-Copyright \(co 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009, 2010,
+Copyright \(co 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009, 2010
 2011 Free Software Foundation, Inc.
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-.PP
-Written by Brendan O'Dea <bod@debian.org>
+.br
+Dies ist freie Software. Lesen Sie die Quelle, um die Kopierbedingungen
+zu erhalten. Es gibt KEINE Gewährleistung, nicht einmal für
+MARKTGÄNGIGKEIT oder EIGNUNG FÜR SPEZIELLE ZWECKE.
 .SH "SIEHE AUCH"
 Die vollständige Dokumentation für
 .B help2man
diff --git a/help2man.el.1 b/help2man.el.1
index 9514122..dadceb4 100644
--- a/help2man.el.1
+++ b/help2man.el.1
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.39.2.
-.TH HELP2MAN "1" "Μάρτιος 2011" "help2man 1.39.2" "Εντολές χρήστη"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.39.3.
+.TH HELP2MAN "1" "Μάιος 2011" "help2man 1.39.3" "Εντολές χρήστη"
 .SH NAME
 help2man \- δημιουργία απλής σελίδας εγχειριδίου
 .SH DESCRIPTION
diff --git a/help2man.eo.1 b/help2man.eo.1
index c3b5ff2..0e07834 100644
--- a/help2man.eo.1
+++ b/help2man.eo.1
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.39.2.
-.TH HELP2MAN "1" "Marto 2011" "help2man 1.39.2" "Uzant-Komandoj"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.39.3.
+.TH HELP2MAN "1" "Majo 2011" "help2man 1.39.3" "Uzant-Komandoj"
 .SH NOMO
 help2man \- generas simplan man-paĝon
 .SH RESUMO
diff --git a/help2man.fi.1 b/help2man.fi.1
index 2e7970d..f9394c7 100644
--- a/help2man.fi.1
+++ b/help2man.fi.1
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.39.2.
-.TH HELP2MAN "1" "maaliskuu 2011" "help2man 1.39.2" "Käyttäjän sovellukset"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.39.3.
+.TH HELP2MAN "1" "toukokuu 2011" "help2man 1.39.3" "Käyttäjän sovellukset"
 .SH NIMI
 help2man \- luo yksinkertainen man-sivu
 .SH YLEISKATSAUS
diff --git a/help2man.fr.1 b/help2man.fr.1
index deb89ce..4a5d9cc 100644
--- a/help2man.fr.1
+++ b/help2man.fr.1
@@ -1,68 +1,73 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.39.2.
-.TH HELP2MAN "1" "mars 2011" "help2man 1.39.2" "Commandes"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.39.3.
+.TH HELP2MAN "1" "mai 2011" "help2man 1.39.3" "Commandes"
 .SH NOM
 help2man \- crée une page de manuel sommaire
 .SH SYNOPSIS
 .B help2man
-[\fIOPTION\fR]... \fIEXECUTABLE\fR
+[\fIOPTION\fR]... \fIPROGRAMME\fR
 .SH DESCRIPTION
-`help2man' generates a man page out of `\-\-help' and `\-\-version' output.
+«\ help2man\ » crée la page de manuel d'un programme à partir des
+indications fournies par celui\-ci lorsqu'il est lancé avec les
+options «\ \-\-help\ » et «\ \-\-version\ ».
 .TP
-\fB\-n\fR, \fB\-\-name\fR=\fISTRING\fR
-description for the NAME paragraph
+\fB\-n\fR, \fB\-\-name\fR=\fICHAÎNE\fR
+description pour le paragraphe NOM
 .TP
 \fB\-s\fR, \fB\-\-section\fR=\fISECTION\fR
-section number for manual page (1, 6, 8)
+numéro de section de la page de
+manuel (1, 6, 8)
 .TP
-\fB\-m\fR, \fB\-\-manual\fR=\fITEXT\fR
-name of manual (User Commands, ...)
+\fB\-m\fR, \fB\-\-manual\fR=\fITEXTE\fR
+nom du manuel (Commandes, ...)
 .TP
-\fB\-S\fR, \fB\-\-source\fR=\fITEXT\fR
-source of program (FSF, Debian, ...)
+\fB\-S\fR, \fB\-\-source\fR=\fITEXTE\fR
+source du programme (FSF, Debian, ...)
 .TP
-\fB\-L\fR, \fB\-\-locale\fR=\fISTRING\fR
-select locale (default "C")
+\fB\-L\fR, \fB\-\-locale\fR=\fICHAÎNE\fR
+changer les paramètres régionaux
+(«\ C\ » par défaut)
 .TP
-\fB\-i\fR, \fB\-\-include\fR=\fIFILE\fR
-include material from `FILE'
+\fB\-i\fR, \fB\-\-include\fR=\fIFICHIER\fR
+ajouter du texte depuis «\ FICHIER\ »
 .TP
-\fB\-I\fR, \fB\-\-opt\-include\fR=\fIFILE\fR
-include material from `FILE' if it exists
+\fB\-I\fR, \fB\-\-opt\-include\fR=\fIFICHIER\fR
+ajouter du texte depuis «\ FICHIER\ »,
+si ce fichier existe
 .TP
-\fB\-o\fR, \fB\-\-output\fR=\fIFILE\fR
-send output to `FILE'
+\fB\-o\fR, \fB\-\-output\fR=\fIFICHIER\fR
+envoyer le résultat dans «\ FICHIER\ »
 .TP
-\fB\-p\fR, \fB\-\-info\-page\fR=\fITEXT\fR
-name of Texinfo manual
+\fB\-p\fR, \fB\-\-info\-page\fR=\fITEXTE\fR
+nom du manuel Texinfo
 .TP
 \fB\-N\fR, \fB\-\-no\-info\fR
-suppress pointer to Texinfo manual
+supprimer le pointeur vers le manuel Texinfo
 .TP
 \fB\-l\fR, \fB\-\-libtool\fR
-exclude the `lt\-' from the program name
+exclure le «\ lt\-\ » du nom de programme
 .TP
 \fB\-\-help\fR
-print this help, then exit
+afficher cette aide, puis quitter
 .TP
 \fB\-\-version\fR
-print version number, then exit
+afficher le numéro de version, puis quitter
 .PP
-EXECUTABLE should accept `\-\-help' and `\-\-version' options and produce output on
-stdout although alternatives may be specified using:
+PROGRAMME devrait accepter les options «\ \-\-help\ » et «\ \-\-version\ »
+et écrire sur la sortie standard mais des alternatives peuvent être
+précisées en utilisant\ :
 .TP
-\fB\-h\fR, \fB\-\-help\-option\fR=\fISTRING\fR
-help option string
+\fB\-h\fR, \fB\-\-help\-option\fR=\fICHAÎNE\fR
+chaîne pour l'option équivalente à «\ \-\-help\ »
 .TP
-\fB\-v\fR, \fB\-\-version\-option\fR=\fISTRING\fR
-version option string
+\fB\-v\fR, \fB\-\-version\-option\fR=\fICHAÎNE\fR
+chaîne pour l'option équivalente à «\ \-\-version\ »
 .TP
-\fB\-\-version\-string\fR=\fISTRING\fR
-version string
+\fB\-\-version\-string\fR=\fICHAÎNE\fR
+chaîne de version
 .TP
 \fB\-\-no\-discard\-stderr\fR
-include stderr when parsing option output
-.PP
-Report bugs to <bug\-help2man@gnu.org>.
+inclure la sortie d'erreur standard lors
+de l'analyse de la sortie d'option
 .SH "FICHIERS INCLUS"
 Un supplément de texte peut être ajouté aux indications fournies par le
 programme grâce aux options
@@ -133,13 +138,17 @@ apparaissent dans le fichier inclus.
 La dernière version de cette distribution est disponible en ligne sur\\ :
 
     ftp://ftp.gnu.org/gnu/help2man/
+.SH AUTEUR
+Écrit par Brendan O'Dea <bod@debian.org>
+.SH "SIGNALER DES BOGUES"
+Signaler les bogues à <bug\-help2man@gnu.org>.
 .SH COPYRIGHT
 Copyright \(co 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009, 2010,
 2011 Free Software Foundation, Inc.
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-.PP
-Written by Brendan O'Dea <bod@debian.org>
+.br
+Ce logiciel est libre\ ; voir les sources pour les conditions de
+reproduction. AUCUNE garantie n'est donnée, pas même la garantie
+implicite de COMMERCIALISATION ni l'ADAPTATION À UN BESOIN PARTICULIER.
 .SH "VOIR AUSSI"
 La documentation complète pour
 .B help2man
diff --git a/help2man.info b/help2man.info
index ab0738b..7e74b0f 100644
--- a/help2man.info
+++ b/help2man.info
@@ -9,8 +9,8 @@ END-INFO-DIR-ENTRY
    This file documents the GNU `help2man' command which produces simple
 manual pages from the `--help' and `--version' output of other commands.
 
-   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009, 2010
-Free Software Foundation, Inc.
+   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009, 2010,
+2011 Free Software Foundation, Inc.
 
    Permission is granted to make and distribute verbatim copies of this
 manual provided the copyright notice and this permission notice are
@@ -333,9 +333,9 @@ will not be (if installed at all) correct for the version of the
 program being built.
 
    A preloadable library is provided with `help2man' which will
-intercept `gettext' calls configuring the location of message catalogs
-for the domain given by `$TEXTDOMAIN' and override the location to the
-path given by `$LOCALEDIR'.
+intercept `bindtextdomain' calls configuring the location of message
+catalogs for the domain given by `$TEXTDOMAIN' and override the
+location to the path given by `$LOCALEDIR'.
 
    So for example:
 
@@ -355,19 +355,15 @@ path given by `$LOCALEDIR'.
      done by `gettext', if a more specific match were available it
      would also have been re-mapped.
 
-   * The inclusion of `preloadable_libintl.so' in `$LD_PRELOAD' is
-     required only for cases (such as `glibc') where `gettext' is built
-     into libc (where `__open' would otherwise be satisfied internally).
-
-   * This preload hack has only been tested against `glibc' 2.3.1 and
-     `gettext' 2.3.1 on a GNU/Linux system; let me know if it does (or
-     doesn't) work for you (*note Reports::).
+   * This preload has only been tested against `eglibc' 2.11.2 and
+     `gettext' 0.18.1.1 on a GNU/Linux system; let me know if it does
+     (or doesn't) work for you (*note Reports::).
 
    ---------- Footnotes ----------
 
-   (1) `help2man' currently supports `de_DE', `fi_FI', `fr_FR', `pl_PL',
-`pt_BR' and `sv_SE' (*note Reports:: for how to submit other
-translations).
+   (1) See `http://translationproject.org/domain/help2man.html' for the
+languages currently supported by `help2man', and *note Reports:: for
+how to submit other translations.
 
 
 File: help2man.info,  Node: Reports,  Next: Availability,  Prev: Localised man pages,  Up: Top
@@ -378,9 +374,9 @@ File: help2man.info,  Node: Reports,  Next: Availability,  Prev: Localised man p
 If you find problems or have suggestions about this program or manual,
 please report them to <bug-help2man@gnu.org>.
 
-   Note to translators:  when submitting new translations for
-`po/help2man.pot' please additionally translate `help2man.h2m' (used to
-augment the manual pages for `help2man').
+   Note to translators: Translations are handled though the Translation
+Project (http://translationproject.org/) see
+`http://translationproject.org/html/translators.html' for details.
 
 
 File: help2man.info,  Node: Availability,  Prev: Reports,  Up: Top
@@ -395,15 +391,15 @@ The latest version of this distribution is available on-line from:
 
 
 Tag Table:
-Node: Top1131
-Node: Overview1838
-Node: Invoking help2man2545
-Node: --help recommendations4896
-Node: Including text8314
-Node: Makefile usage10025
-Node: Localised man pages10964
-Ref: Localised man pages-Footnote-112875
-Node: Reports13025
-Node: Availability13483
+Node: Top1137
+Node: Overview1844
+Node: Invoking help2man2551
+Node: --help recommendations4902
+Node: Including text8320
+Node: Makefile usage10031
+Node: Localised man pages10970
+Ref: Localised man pages-Footnote-112675
+Node: Reports12851
+Node: Availability13317
 
 End Tag Table
diff --git a/help2man.it.1 b/help2man.it.1
index 25116c8..6455137 100644
--- a/help2man.it.1
+++ b/help2man.it.1
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.39.2.
-.TH HELP2MAN "1" "marzo 2011" "help2man 1.39.2" "Comandi utente"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.39.3.
+.TH HELP2MAN "1" "maggio 2011" "help2man 1.39.3" "Comandi utente"
 .SH NOME
 help2man \- genera una semplice pagina di manuale
 .SH DESCRIZIONE
diff --git a/help2man.pl.1 b/help2man.pl.1
index e488242..df3e64c 100644
--- a/help2man.pl.1
+++ b/help2man.pl.1
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.39.2.
-.TH HELP2MAN "1" "marzec 2011" "help2man 1.39.2" "Polecenia użytkownika"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.39.3.
+.TH HELP2MAN "1" "maj 2011" "help2man 1.39.3" "Polecenia użytkownika"
 .SH NAZWA
 help2man \- generowanie prostej strony podręcznika
 .SH SKŁADNIA
diff --git a/help2man.pt_BR.1 b/help2man.pt_BR.1
index ef9ed34..3a9944c 100644
--- a/help2man.pt_BR.1
+++ b/help2man.pt_BR.1
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.39.2.
-.TH HELP2MAN "1" "março 2011" "help2man 1.39.2" "Comandos de usuário"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.39.3.
+.TH HELP2MAN "1" "maio 2011" "help2man 1.39.3" "Comandos de usuário"
 .SH NOME
 help2man \- gera uma página de manual simples
 .SH DESCRIÇÃO
diff --git a/help2man.ru.1 b/help2man.ru.1
index caf769d..459a15b 100644
--- a/help2man.ru.1
+++ b/help2man.ru.1
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.39.2.
-.TH HELP2MAN "1" "Март 2011" "help2man 1.39.2" "Пользовательские команды"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.39.3.
+.TH HELP2MAN "1" "Май 2011" "help2man 1.39.3" "Пользовательские команды"
 .SH ИМЯ
 help2man \- генерирует простую справочную страницу
 .SH ОБЗОР
diff --git a/help2man.sv.1 b/help2man.sv.1
index 932c92a..96032c8 100644
--- a/help2man.sv.1
+++ b/help2man.sv.1
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.39.2.
-.TH HELP2MAN "1" "mars 2011" "help2man 1.39.2" "Användarkommandon"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.39.3.
+.TH HELP2MAN "1" "maj 2011" "help2man 1.39.3" "Användarkommandon"
 .SH NAMN
 help2man \- generera en enkel manualsida
 .SH BESKRIVNING
diff --git a/help2man.texi b/help2man.texi
index d0aa7c3..ea30009 100644
--- a/help2man.texi
+++ b/help2man.texi
@@ -14,7 +14,7 @@ This file documents the GNU @command{help2man} command which produces
 simple manual pages from the @samp{--help} and @samp{--version} output
 of other commands.
 
-Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009, 2010
+Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009, 2010, 2011
 Free Software Foundation, Inc.
 
 Permission is granted to make and distribute verbatim copies of
@@ -46,7 +46,7 @@ by the Foundation.
 
 @page
 @vskip 0pt plus 1filll
-Copyright @copyright{} 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009
+Copyright @copyright{} 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009, 2010, 2011
 Free Software Foundation, Inc.
 
 Permission is granted to make and distribute verbatim copies of
@@ -379,10 +379,11 @@ for @command{autoconf} alone.
 @chapter Producing Native Language Manual Pages.
 
 Manual pages may be produced for any locale supported by both the
-program and @command{help2man}@footnote{@command{help2man} currently
-supports @samp{de_DE}, @samp{fi_FI}, @samp{fr_FR}, @samp{pl_PL},
-@samp{pt_BR} and @samp{sv_SE} (@pxref{Reports} for how to submit other
-translations).} with the @samp{--locale} (@samp{-L}) option.
+program and @command{help2man}@footnote{See
+@url{http://translationproject.org/domain/help2man.html} for the
+languages currently supported by @command{help2man}, and @pxref{Reports}
+for how to submit other translations.} with the @samp{--locale} (@samp{-L})
+option.
 
 @example
 help2man -L fr_FR@@euro -o cp.fr.1 cp
@@ -396,7 +397,7 @@ will not be (if installed at all) correct for the version of the
 program being built.
 
 A preloadable library is provided with @command{help2man} which will
-intercept @code{gettext} calls configuring the location of message
+intercept @code{bindtextdomain} calls configuring the location of message
 catalogs for the domain given by @env{$TEXTDOMAIN} and override the
 location to the path given by @env{$LOCALEDIR}.
 
@@ -423,14 +424,8 @@ above is done by @code{gettext}, if a more specific match were available
 it would also have been re-mapped.
 
 @item
-The inclusion of @code{preloadable_libintl.so} in @env{$LD_PRELOAD} is
-required only for cases (such as @code{glibc}) where @code{gettext} is
-built into libc (where @code{__open} would otherwise be satisfied
-internally).
-
-@item
-This preload hack has only been tested against @command{glibc} 2.3.1
-and @command{gettext} 2.3.1 on a GNU/Linux system; let me know if it
+This preload has only been tested against @command{eglibc} 2.11.2 and
+@command{gettext} 0.18.1.1 on a GNU/Linux system; let me know if it
 does (or doesn't) work for you (@pxref{Reports}).
 @end itemize
 
@@ -440,10 +435,9 @@ does (or doesn't) work for you (@pxref{Reports}).
 If you find problems or have suggestions about this program or
 manual, please report them to @email{bug-help2man@@gnu.org}.
 
-Note to translators:  when submitting new translations for
-@code{po/help2man.pot} please additionally translate
-@code{help2man.h2m} (used to augment the manual pages for
-@code{help2man}).
+Note to translators: Translations are handled though the
+@uref{http://translationproject.org/, Translation Project} see
+@url{http://translationproject.org/html/translators.html} for details.
 
 @node Availability
 @chapter Obtaining @command{help2man}
diff --git a/help2man.uk.1 b/help2man.uk.1
index 69a8e2b..37d5cac 100644
--- a/help2man.uk.1
+++ b/help2man.uk.1
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.39.2.
-.TH HELP2MAN "1" "березень 2011" "help2man 1.39.2" "Команди користувача"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.39.3.
+.TH HELP2MAN "1" "травень 2011" "help2man 1.39.3" "Команди користувача"
 .SH НАЗВА
 help2man \— програма для створення простих сторінок довідника
 .SH "КОРОТКИЙ ОПИС"
diff --git a/help2man.vi.1 b/help2man.vi.1
index 7781a94..0c5543b 100644
--- a/help2man.vi.1
+++ b/help2man.vi.1
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.39.2.
-.TH HELP2MAN "1" "Tháng ba 2011" "help2man 1.39.2" "Lệnh người dùng"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.39.3.
+.TH HELP2MAN "1" "Tháng năm 2011" "help2man 1.39.3" "Lệnh người dùng"
 .SH TÊN
 help2man \- tạo một trang hướng dẫn đơn giản
 .SH "MÔ TẢ"
diff --git a/po/de.gmo b/po/de.gmo
index 188f8b9..1eb29b3 100644
Binary files a/po/de.gmo and b/po/de.gmo differ
diff --git a/po/de.po b/po/de.po
index f97052e..f6c307e 100644
--- a/po/de.po
+++ b/po/de.po
@@ -1,15 +1,14 @@
 # Translation of help2man to German
-# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003 Free Software
-# Foundation, Inc.
+# Copyright (C) 1997-2003 Free Software Foundation, Inc.
 # This file is distributed under the same license as the help2man package.
-# Chris Leick <c.leick@vollbio.de>, 2009.
+# Chris Leick 2009, 2011 <c.leick@vollbio.de>.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: help2man 1.36.4\n"
+"Project-Id-Version: help2man 1.39.2\n"
 "Report-Msgid-Bugs-To: Brendan O'Dea <bug-help2man@gnu.org>\n"
 "POT-Creation-Date: 2011-02-28 11:20+1100\n"
-"PO-Revision-Date: 2009-09-14 22:12+GMT\n"
+"PO-Revision-Date: 2011-05-01 10:25+1000\n"
 "Last-Translator: Chris Leick <c.leick@vollbio.de>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
 "Language: de\n"
@@ -18,7 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: help2man:69
-#, fuzzy, perl-format
+#, perl-format
 msgid ""
 "GNU %s %s\n"
 "\n"
@@ -34,7 +33,7 @@ msgstr ""
 "\n"
 "Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009, "
 "2010\n"
-"Free Software Foundation, Inc.\n"
+"2011 Free Software Foundation, Inc.\n"
 "Dies ist freie Software. Lesen Sie die Quelle, um die Kopierbedingungen\n"
 "zu erhalten. Es gibt KEINE Gewährleistung, nicht einmal für\n"
 "MARKTGÄNGIGKEIT oder EIGNUNG FÜR SPEZIELLE ZWECKE.\n"
@@ -42,7 +41,7 @@ msgstr ""
 "Geschrieben von Brendan O'Dea <bod@debian.org>\n"
 
 #: help2man:80
-#, fuzzy, perl-format
+#, perl-format
 msgid ""
 "`%s' generates a man page out of `--help' and `--version' output.\n"
 "\n"
@@ -73,7 +72,7 @@ msgid ""
 "\n"
 "Report bugs to <bug-help2man@gnu.org>.\n"
 msgstr ""
-"`%s' generiert aus der Ausgabe von »--help« und »--version« eine\n"
+"»%s« generiert aus der Ausgabe von »--help« und »--version« eine\n"
 "Handbuchseite.\n"
 "\n"
 "Aufruf: %s [OPTION]... PROGRAMM\n"
@@ -83,13 +82,14 @@ msgstr ""
 " -m, --manual=TEXT          Name des Handbuchs (Anwenderbefehle, ...)\n"
 " -S, --source=TEXT          Quelle des Programms (FSF, Debian, ...)\n"
 " -L, --locale=ZEICHENKETTE  Locale auswählen (Vorgabe »C«)\n"
-" -i, --include=DATEI        Material aus »DATEI« einschließen\n"
-" -I, --opt-include=DATEI    Material aus »DATEI« einschließen, wenn es\n"
+" -i, --include=DATEI        Material aus »DATEI« einbinden\n"
+" -I, --opt-include=DATEI    Material aus »DATEI« einbinden, wenn es\n"
 "                            existiert\n"
-" -o, --output=DATEI         Ausgabe an »DATEI« senden\n"
+" -o, --output=DATEI         in »DATEI« ausgeben\n"
 " -p, --info-page=DATEI      Name des Texinfo-Handbuchs\n"
-" -N, --no-info              Zeiger auf Texinfo-Handbuch unterdrücken\n"
-"     --help                 Diese Hilfe anzeigen, dann beenden\n"
+" -N, --no-info              Verweis auf Texinfo-Handbuch unterdrücken\n"
+" -l, --libtool              das »lt-« aus dem Programmnamen ausschließen\n"
+"     --help                 diese Hilfe anzeigen, dann beenden\n"
 "     --version              Versionsnummer anzeigen, dann beenden\n"
 "\n"
 "PROGRAMM sollte »--help«- und »--version«-Optionen\n"
@@ -192,11 +192,11 @@ msgstr "Optionen"
 
 #: help2man:398
 msgid "Environment"
-msgstr ""
+msgstr "Umgebung"
 
 #: help2man:399
 msgid "Files"
-msgstr ""
+msgstr "Dateien"
 
 #: help2man:400
 msgid "Examples"
@@ -212,11 +212,11 @@ msgstr "OPTIONEN"
 
 #: help2man:422 help2man:617 help2man.h2m.PL:133
 msgid "ENVIRONMENT"
-msgstr ""
+msgstr "UMGEBUNG"
 
 #: help2man:427 help2man:617 help2man.h2m.PL:134
 msgid "FILES"
-msgstr ""
+msgstr "DATEIEN"
 
 #: help2man:432 help2man:617 help2man.h2m.PL:135
 msgid "EXAMPLES"
@@ -279,6 +279,8 @@ msgstr "%s: Es wurde keine »%s«-Information von %s erhalten%s"
 #: help2man:666
 msgid "Try `--no-discard-stderr' if option outputs to stderr"
 msgstr ""
+"Versuchen Sie »--no-discard-stderr« falls die Option auf der "
+"Standardfehlerausgabe ausgibt."
 
 #: help2man.h2m.PL:74
 msgid "Include file for help2man man page"
@@ -366,7 +368,7 @@ msgstr ""
 
 #: help2man.h2m.PL:127
 msgid "The section output order (for those included) is:"
-msgstr "Die Reihenfolge in der die Abschnitte ausgegeben werden, ist:"
+msgstr "Die Reihenfolge, in der die Abschnitte ausgegeben werden, ist:"
 
 #: help2man.h2m.PL:136
 msgid "other"
diff --git a/po/fr.gmo b/po/fr.gmo
index ed33187..856141c 100644
Binary files a/po/fr.gmo and b/po/fr.gmo differ
diff --git a/po/fr.po b/po/fr.po
index ba8503f..b86f0de 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -1,17 +1,17 @@
 # Translation of help2man to French
-# Copyright (C) 1997-2005, 2010 Free Software Foundation, Inc.
+# Copyright (C) 1997-2005, 2010, 2011 Free Software Foundation, Inc.
 # This file is distributed under the same license as the help2man package.
 #
 # Denis Barbier <barbier@linuxfr.org>, 1997-2005.
-# David Prévot <david@tilapin.org>, 2010.
+# David Prévot <david@tilapin.org>, 2010, 2011.
 msgid ""
 msgstr ""
-"Project-Id-Version: help2man 1.38.2\n"
+"Project-Id-Version: help2man 1.39.1\n"
 "Report-Msgid-Bugs-To: Brendan O'Dea <bug-help2man@gnu.org>\n"
 "POT-Creation-Date: 2011-02-28 11:20+1100\n"
-"PO-Revision-Date: 2010-07-24 18:26-0400\n"
+"PO-Revision-Date: 2011-03-24 11:46-0400\n"
 "Last-Translator: David Prévot <david@tilapin.org>\n"
-"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
+"Language-Team: French <traduc@traduc.org>\n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,12 +20,11 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: help2man:69
-#, fuzzy, perl-format
+#, perl-format
 msgid ""
 "GNU %s %s\n"
 "\n"
-"Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009, "
-"2010,\n"
+"Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009, 2010,\n"
 "2011 Free Software Foundation, Inc.\n"
 "This is free software; see the source for copying conditions.  There is NO\n"
 "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
@@ -34,9 +33,8 @@ msgid ""
 msgstr ""
 "GNU %s %s\n"
 "\n"
-"Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009, "
-"2010\n"
-"Free Software Foundation, Inc.\n"
+"Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009, 2010,\n"
+"2011 Free Software Foundation, Inc.\n"
 "Ce logiciel est libre ; voir les sources pour les conditions de\n"
 "reproduction. AUCUNE garantie n'est donnée, pas même la garantie\n"
 "implicite de COMMERCIALISATION ni l'ADAPTATION À UN BESOIN PARTICULIER.\n"
@@ -44,7 +42,7 @@ msgstr ""
 "Écrit par Brendan O'Dea <bod@debian.org>\n"
 
 #: help2man:80
-#, fuzzy, perl-format
+#, perl-format
 msgid ""
 "`%s' generates a man page out of `--help' and `--version' output.\n"
 "\n"
@@ -64,8 +62,7 @@ msgid ""
 "     --help              print this help, then exit\n"
 "     --version           print version number, then exit\n"
 "\n"
-"EXECUTABLE should accept `--help' and `--version' options and produce output "
-"on\n"
+"EXECUTABLE should accept `--help' and `--version' options and produce output on\n"
 "stdout although alternatives may be specified using:\n"
 "\n"
 " -h, --help-option=STRING     help option string\n"
@@ -94,6 +91,7 @@ msgstr ""
 " -o, --output=FICHIER       envoyer le résultat dans « FICHIER »\n"
 " -p, --info-page=TEXTE      nom du manuel Texinfo\n"
 " -N, --no-info              supprimer le pointeur vers le manuel Texinfo\n"
+" -l, --libtool              exclure le « lt- » du nom de programme\n"
 "     --help                 afficher cette aide, puis quitter\n"
 "     --version              afficher le numéro de version, puis quitter\n"
 "\n"
@@ -102,8 +100,7 @@ msgstr ""
 "précisées en utilisant :\n"
 "\n"
 " -h, --help-option=CHAÎNE     chaîne pour l'option équivalente à « --help »\n"
-" -v, --version-option=CHAÎNE  chaîne pour l'option équivalente à « --"
-"version »\n"
+" -v, --version-option=CHAÎNE  chaîne pour l'option équivalente à « --version »\n"
 " --version-string=CHAÎNE      chaîne de version\n"
 " --no-discard-stderr          inclure la sortie d'erreur standard lors\n"
 "                              de l'analyse de la sortie d'option\n"
@@ -205,9 +202,7 @@ msgstr "DESCRIPTION"
 #. be matched.
 #: help2man:395
 msgid "Report +(?:[\\w-]+ +)?bugs|Email +bug +reports +to"
-msgstr ""
-"([Ss]ignaler|[Rr]apporter|[Ee]nvoyer) +(?:[\\w-]+ +)?(bogue|anomalie|"
-"problème)s?"
+msgstr "([Ss]ignaler|[Rr]apporter|[Ee]nvoyer) +(?:[\\w-]+ +)?(bogue|anomalie|problème)s?"
 
 #  When a string matches this regular expression, it is put into an
 #  AUTHOR section.
@@ -460,5 +455,4 @@ msgstr "DISPONIBILITÉ"
 
 #: help2man.h2m.PL:165
 msgid "The latest version of this distribution is available on-line from:"
-msgstr ""
-"La dernière version de cette distribution est disponible en ligne sur\\ :"
+msgstr "La dernière version de cette distribution est disponible en ligne sur\\ :"