diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc
index f08785ac77da..8d98dddb8c90 100644
--- a/ObsoleteFiles.inc
+++ b/ObsoleteFiles.inc
@@ -6737,7 +6737,6 @@ OLD_FILES+=usr/share/man/man4/if_hme.4.gz
 OLD_FILES+=usr/include/net/radix_mpath.h
 
 # 20201124: ping6(8) was merged into ping(8)
-OLD_FILES+=usr/share/man/man8/ping6.8.gz
 OLD_FILES+=usr/tests/sbin/ping6/Kyuafile
 OLD_FILES+=usr/tests/sbin/ping6/ping6_c1_s8_t1.out
 OLD_FILES+=usr/tests/sbin/ping6/ping6_test
diff --git a/sbin/ping/Makefile b/sbin/ping/Makefile
index 4713b01cac90..1483a93ace37 100644
--- a/sbin/ping/Makefile
+++ b/sbin/ping/Makefile
@@ -20,6 +20,7 @@ CFLAGS+= -DINET6 -DKAME_SCOPEID
 SRCS+=	ping6.c
 LIBADD+= md
 LINKS=	${BINDIR}/ping ${BINDIR}/ping6
+MLINKS=	ping.8 ping6.8
 .endif
 
 .if ${MK_DYNAMICROOT} == "no"