diff --git a/etc/man.conf b/etc/man.conf
index c9d3c84cc4bd..267c56bf74f1 100644
--- a/etc/man.conf
+++ b/etc/man.conf
@@ -7,7 +7,7 @@ _version	BSD.2
 _mandb /var/db/man.db
 
 # Subdirectories for paths ending in '/', IN SEARCH ORDER.
-_subdir		cat1 man1 cat8 man8 cat6 man6 cat2 man2 cat3 man3 cat3lua man3lua cat4 man4 cat5 man5 cat7 man7 man3f cat9 man9 cat9lua man9lua catn mann catl manl
+_subdir		man1 man8 man6 man2 man3 man3lua man4 man5 man7 man3f man9 man9lua mann manl
 
 # Files typed by suffix and their commands.
 # Note the order, .Z must come after .[1-9].Z, or it will match first.
@@ -48,23 +48,23 @@ packages	/usr/pkg/man/
 local		/usr/local/man/
 
 # Specific section/directory combinations.
-1		{cat,man}1
-2		{cat,man}2
-3		{cat,man}3
-3F		{cat,man}3f
-3f		{cat,man}3f
-3lua		{cat,man}3lua
-3l		{cat,man}3lua
-4		{cat,man}4
-5		{cat,man}5
-6		{cat,man}6
-7		{cat,man}7
-8		{cat,man}8
-9		{cat,man}9
-9lua		{cat,man}9lua
-9l		{cat,man}9lua
-l		{cat,man}l
-n		{cat,man}n
+1		man1
+2		man2
+3		man3
+3F		man3f
+3f		man3f
+3lua		man3lua
+3l		man3lua
+4		man4
+5		man5
+6		man6
+7		man7
+8		man8
+9		man9
+9lua		man9lua
+9l		man9lua
+l		manl
+n		mann
 
 # machine classes per machine
 _i386		x86