--- src/man.conf.in.orig	2005-08-20 16:26:06.000000000 -0700
+++ src/man.conf.in	2007-01-12 16:53:47.000000000 -0800
@@ -36,11 +36,9 @@
 #
 # Every automatically generated MANPATH includes these fields
 #
-MANPATH	/usr/man
 MANPATH	/usr/share/man
-MANPATH	/usr/local/man
 MANPATH	/usr/local/share/man
-MANPATH	/usr/X11R6/man
+MANPATH	/usr/X11/man
 #
 # Uncomment if you want to include one of these by default
 #
@@ -64,8 +62,8 @@
 MANPATH_MAP	/usr/sbin		/usr/share/man
 MANPATH_MAP	/usr/local/bin		/usr/local/share/man
 MANPATH_MAP	/usr/local/sbin		/usr/local/share/man
-MANPATH_MAP	/usr/X11R6/bin		/usr/X11R6/man
-MANPATH_MAP	/usr/bin/X11		/usr/X11R6/man
+MANPATH_MAP	/usr/X11/bin		/usr/X11/man
+MANPATH_MAP	/usr/bin/X11		/usr/X11/man
 MANPATH_MAP	/usr/bin/mh		/usr/share/man
 #
 # NOAUTOPATH keeps man from automatically adding directories that look like