diff --git a/infrastructure/mk/bsd.port.mk b/infrastructure/mk/bsd.port.mk
index 358af9efb61..759fcc144df 100644
--- a/infrastructure/mk/bsd.port.mk
+++ b/infrastructure/mk/bsd.port.mk
@@ -1,6 +1,6 @@
 #-*- mode: Fundamental; tab-width: 4; -*-
 # ex:ts=4 sw=4 filetype=make:
-FULL_REVISION=$$OpenBSD: bsd.port.mk,v 1.516 2002/03/21 21:28:29 espie Exp $$
+FULL_REVISION=$$OpenBSD: bsd.port.mk,v 1.517 2002/04/02 15:55:55 espie Exp $$
 #	$FreeBSD: bsd.port.mk,v 1.264 1996/12/25 02:27:44 imp Exp $
 #	$NetBSD: bsd.port.mk,v 1.62 1998/04/09 12:47:02 hubertf Exp $
 #
@@ -1374,7 +1374,7 @@ ${_BUILDLIBLIST}: ${_FAKE_COOKIE}
 
 .if defined(IGNORE) && !defined(NO_IGNORE)
 fetch checksum extract patch configure all build install regress \
-uninstall deinstall fake package lib-depends-check:
+uninstall deinstall fake package lib-depends-check manpages-check:
 .  if !defined(IGNORE_SILENT)
 	@${ECHO_MSG} "===>  ${FULLPKGNAME${SUBPACKAGE}} ${IGNORE}."
 .  endif
@@ -1393,7 +1393,10 @@ lib-depends-check: ${_LIBLIST} ${_BUILDLIBLIST}
 		perl ${PORTSDIR}/infrastructure/install/check-libs \
 		${_LIBLIST} ${_BUILDLIBLIST}
 
-
+manpages-check: ${_FAKE_COOKIE}
+	@cd ${WRKINST}${TRUEPREFIX}/man && \
+		${SUDO} /usr/libexec/makewhatis -p . && \
+		cat whatis.db
 
 # Most standard port targets create a cookie to avoid being re-run.
 #
@@ -2777,4 +2780,4 @@ homepage-links:
    dir-depends _recurse-dir-depends package-dir-depends \
    _package-recurse-dir-depends recursebuild-depends-list run-depends-list \
    bulk-packages bulk-do _recurse-lib-depends lib-depends-check \
-   homepage-links
+   homepage-links manpages-check
diff --git a/infrastructure/mk/bsd.port.subdir.mk b/infrastructure/mk/bsd.port.subdir.mk
index fa5cae655ca..e1d9d7e02cc 100644
--- a/infrastructure/mk/bsd.port.subdir.mk
+++ b/infrastructure/mk/bsd.port.subdir.mk
@@ -1,5 +1,5 @@
 #	from: @(#)bsd.subdir.mk	5.9 (Berkeley) 2/1/91
-#	$OpenBSD: bsd.port.subdir.mk,v 1.44 2002/03/13 13:51:59 espie Exp $
+#	$OpenBSD: bsd.port.subdir.mk,v 1.45 2002/04/02 15:55:55 espie Exp $
 #	FreeBSD Id: bsd.port.subdir.mk,v 1.20 1997/08/22 11:16:15 asami Exp
 #
 # The include file <bsd.port.subdir.mk> contains the default targets
@@ -152,7 +152,7 @@ ${SUBDIR}::
 		 dir-depends package-dir-depends bulk-packages \
 		 ftp-packages packageinstall link-categories \
 		 unlink-categories regress bulk-do lib-depends-check \
-		 homepage-links
+		 homepage-links manpages-check
 
 .if !target(${__target})
 ${__target}: _SUBDIRUSE
@@ -217,4 +217,4 @@ README.html:
 	beforeinstall afterinstall install realinstall fake \
 	all-packages cdrom-packages ftp-packages packageinstall \
 	link-categories unlink-categories dir-depends package-dir-depends \
-	regress lib-depends-check homepage-links
+	regress lib-depends-check homepage-links manpages-check