diff --git a/src/etc/man.conf b/src/etc/man.conf
index dcb275fa..613634ff 100644
--- a/src/etc/man.conf
+++ b/src/etc/man.conf
@@ -1,10 +1,12 @@
-#	$OpenBSD: man.conf,v 1.3 1996/05/26 10:25:33 deraadt Exp $
+#	$OpenBSD: man.conf,v 1.4 1996/10/02 00:08:52 dm Exp $
 
 # Sheer, raging paranoia...
 _version	BSD.2
 
 # The whatis/apropos database.
 _whatdb		/usr/share/man/whatis.db
+_whatdb		/usr/local/man/whatis.db
+_whatdb		/usr/X11R6/man/whatis.db
 
 # Subdirectories for paths ending in '/', IN SEARCH ORDER.
 _subdir		cat1 man1 cat8 man8 cat6 man6 cat2 man2 cat3 man3 cat4 man4 cat5 man5 cat7 man7 cat3f man3f cat9 man9