diff --git a/etc/man.conf b/etc/man.conf
index abef91197..a21b7fe20 100644
--- a/etc/man.conf
+++ b/etc/man.conf
@@ -3,8 +3,8 @@ _subdir         man{[1-9],1x}
 _suffix         .0
 _build          .[1-9]  mandoc %s
 _build          .tbl    tbl %s | mandoc 
-_default        /usr/{,pkg/{,gcc44/}}man
-_whatdb		/usr/{,pkg/{,gcc44/}}man/whatis.db
+_default        /usr/{,pkg/{,gcc*/}}man
+_whatdb		/usr/{,pkg/{,gcc*/}}man/whatis.db
 1		man1
 2		man2
 3		man3