diff --git a/src/etc/man.conf b/src/etc/man.conf
index 20646cca..d43143cf 100644
--- a/src/etc/man.conf
+++ b/src/etc/man.conf
@@ -1,4 +1,4 @@
-#	$OpenBSD: man.conf,v 1.17 2011/04/11 14:45:41 sthen Exp $
+#	$OpenBSD: man.conf,v 1.18 2013/07/13 20:21:52 schwarze Exp $
 
 # Sheer, raging paranoia...
 _version	BSD.2
@@ -9,7 +9,7 @@ _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 cat5 man5 cat7 man7 cat4 man4 cat9 man9 cat3p man3p cat3f man3f catn mann
+_subdir		{cat,man}1 {cat,man}8 {cat,man}6 {cat,man}2 {cat,man}3 {cat,man}5 {cat,man}7 {cat,man}4 {cat,man}9 {cat,man}3p {cat,man}3f {cat,man}n
 
 # Files typed by suffix and their commands.
 # Note the order: .Z must come after .[1-9n].Z, or it will match first.