diff --git a/lib/libutil++/Makefile b/lib/libutil++/Makefile
--- a/lib/libutil++/Makefile
+++ b/lib/libutil++/Makefile
@@ -12,6 +12,10 @@
 	freebsd::pidfile.3 \
 	freebsd::stringf.3
 
+.for page in ${MAN}
+MANSRC.${page}=	${page:S/:/_/g}
+.endfor
+
 .include <src.opts.mk>
 
 HAS_TESTS=
diff --git a/lib/libutil++/freebsd::FILE_up.3 b/lib/libutil++/freebsd__FILE_up.3
rename from lib/libutil++/freebsd::FILE_up.3
rename to lib/libutil++/freebsd__FILE_up.3
diff --git a/lib/libutil++/freebsd::addrinfo_up.3 b/lib/libutil++/freebsd__addrinfo_up.3
rename from lib/libutil++/freebsd::addrinfo_up.3
rename to lib/libutil++/freebsd__addrinfo_up.3
diff --git a/lib/libutil++/freebsd::fd_up.3 b/lib/libutil++/freebsd__fd_up.3
rename from lib/libutil++/freebsd::fd_up.3
rename to lib/libutil++/freebsd__fd_up.3
diff --git a/lib/libutil++/freebsd::malloc_up.3 b/lib/libutil++/freebsd__malloc_up.3
rename from lib/libutil++/freebsd::malloc_up.3
rename to lib/libutil++/freebsd__malloc_up.3
diff --git a/lib/libutil++/freebsd::nvlist_up.3 b/lib/libutil++/freebsd__nvlist_up.3
rename from lib/libutil++/freebsd::nvlist_up.3
rename to lib/libutil++/freebsd__nvlist_up.3
diff --git a/lib/libutil++/freebsd::pidfile.3 b/lib/libutil++/freebsd__pidfile.3
rename from lib/libutil++/freebsd::pidfile.3
rename to lib/libutil++/freebsd__pidfile.3
diff --git a/lib/libutil++/freebsd::stringf.3 b/lib/libutil++/freebsd__stringf.3
rename from lib/libutil++/freebsd::stringf.3
rename to lib/libutil++/freebsd__stringf.3