diff --git a/src/etc/man.conf b/src/etc/man.conf
index c0cbe449..ffe8bce2 100644
--- a/src/etc/man.conf
+++ b/src/etc/man.conf
@@ -1,4 +1,4 @@
-#	$OpenBSD: man.conf,v 1.15 2010/04/09 19:07:30 naddy Exp $
+#	$OpenBSD: man.conf,v 1.16 2010/10/19 20:05:52 schwarze Exp $
 
 # Sheer, raging paranoia...
 _version	BSD.2
@@ -16,17 +16,15 @@ _subdir		cat1 man1 cat8 man8 cat6 man6 cat2 man2 cat3 man3 cat5 man5 cat7 man7 c
 _suffix		.0
 _build		.0.Z		/usr/bin/zcat %s
 _build		.0.gz		/usr/bin/gzcat %s
-_build		.[1-9n]		/usr/bin/nroff -Tascii -man %s
-_build		.[1-9n].Z	/usr/bin/zcat %s | /usr/bin/nroff -Tascii -man
-_build		.[1-9n].gz	/usr/bin/gzcat %s | /usr/bin/nroff -Tascii -man
-_build		.[1-9][a-z]	/usr/bin/nroff -Tascii -man %s
-_build		.[1-9][a-z].Z	/usr/bin/zcat %s | /usr/bin/nroff -Tascii -man
-_build		.[1-9][a-z].gz	/usr/bin/gzcat %s | /usr/bin/nroff -Tascii -man
-_build		.tbl		/usr/bin/tbl %s | /usr/bin/nroff -Tascii -man
-_build		.tbl.Z		/usr/bin/zcat %s | /usr/bin/tbl | /usr/bin/nroff -Tascii -man
-_build		.tbl.gz		/usr/bin/gzcat %s | /usr/bin/tbl | /usr/bin/nroff -Tascii -man
-_build		.me		/usr/bin/nroff -Tascii -me %s 2>/dev/null | cat -s
-_build		.ms		/usr/bin/nroff -Tascii -ms %s 2>/dev/null | cat -s
+_build		.[1-9n]		/usr/bin/mandoc %s
+_build		.[1-9n].Z	/usr/bin/zcat %s | /usr/bin/mandoc
+_build		.[1-9n].gz	/usr/bin/gzcat %s | /usr/bin/mandoc
+_build		.[1-9][a-z]	/usr/bin/mandoc %s
+_build		.[1-9][a-z].Z	/usr/bin/zcat %s | /usr/bin/mandoc
+_build		.[1-9][a-z].gz	/usr/bin/gzcat %s | /usr/bin/mandoc
+_build		.tbl		/usr/bin/mandoc %s
+_build		.tbl.Z		/usr/bin/zcat %s | /usr/bin/mandoc
+_build		.tbl.gz		/usr/bin/gzcat %s | /usr/bin/mandoc
 
 # Sections and their directories.
 # All paths ending in '/' are the equivalent of entries specifying that