diff --git a/ChangeLog b/ChangeLog
index 1d440096..4e53b2cf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2009-12-17  Simon Josefsson  <simon@josefsson.org>
+
+	* man/Makefile.am (all): Add ping6.1.
+	(dist_man1_MANS) [ENABLE_ping6]: Add ping6.1.
+	(ping6.1): Add rule.
+	(mapped_name): New variable, for mapping non-standard tool paths.
+	(man): Use $(mapped_name).
+	* NEWS: Updated.
+
 2009-12-17  Simon Josefsson  <simon@josefsson.org>
 
 	* man/Makefile.am (all): Change daemon man section from 1 to 8.
diff --git a/NEWS b/NEWS
index e3245c25..a4304ad3 100644
--- a/NEWS
+++ b/NEWS
@@ -10,6 +10,8 @@ Version 1.7.90:
 
 * Man pages for the daemons are now in section 8 instead of 1.
 
+* There is now a man page for ping6 too.
+
 
 December 16, 2009
 Version 1.7:
diff --git a/man/Makefile.am b/man/Makefile.am
index 8c7cc282..2a0ab80c 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -16,12 +16,10 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see `http://www.gnu.org/licenses/'.
 
-# FIXME: ping6 ifconfig
-
-all = hostname.1 ifconfig.1 inetd.8 ftp.1 ftpd.8 logger.1 ping.1 rcp.1	\
-      rexec.1 rexecd.8 rlogin.1 rlogind.8 rsh.1 rshd.8 syslogd.8	\
-      talk.1 talkd.8 telnet.1 telnetd.8 tftp.1 tftpd.8 traceroute.1	\
-      uucpd.8 whois.1
+all = hostname.1 ifconfig.1 inetd.8 ftp.1 ftpd.8 logger.1 ping.1	\
+      ping6.1 rcp.1 rexec.1 rexecd.8 rlogin.1 rlogind.8 rsh.1 rshd.8	\
+      syslogd.8 talk.1 talkd.8 telnet.1 telnetd.8 tftp.1 tftpd.8	\
+      traceroute.1 uucpd.8 whois.1
 
 dist_man1_MANS =
 
@@ -53,6 +51,10 @@ if ENABLE_ping
 dist_man1_MANS += ping.1
 endif
 
+if ENABLE_ping6
+dist_man1_MANS += ping6.1
+endif
+
 if ENABLE_rcp
 dist_man1_MANS += rcp.1
 endif
@@ -139,6 +141,8 @@ logger.1: logger.h2m $(top_srcdir)/logger/logger.c $(top_srcdir)/configure.ac
 
 ping.1: ping.h2m $(top_srcdir)/ping/ping.c $(top_srcdir)/configure.ac
 
+ping6.1: ping6.h2m $(top_srcdir)/ping/ping6.c $(top_srcdir)/configure.ac
+
 rcp.1: rcp.h2m $(top_srcdir)/rcp/rcp.c $(top_srcdir)/configure.ac
 
 rexec.1: rexec.h2m $(top_srcdir)/rexec/rexec.c $(top_srcdir)/configure.ac
@@ -179,6 +183,8 @@ whois.1: whois.h2m $(top_srcdir)/whois/whois.c $(top_srcdir)/configure.ac
 .h2m.8:
 	make man TOOL=$* SECTION=8
 
+mapped_name = `echo ../$(TOOL)/$(TOOL) | sed s,../ping6/ping6,../ping/ping6,`
+
 .PHONY: man
 man:
 	$(HELP2MAN)					\
@@ -186,4 +192,4 @@ man:
 		--include=$(srcdir)/$(TOOL).h2m		\
 		--output=$(TOOL).$(SECTION)		\
 		--section $(SECTION)			\
-		../$(TOOL)/$(TOOL)
+		$(mapped_name)