2 files changed, 5 insertions, 5 deletions

diff --git a/gnu/usr.bin/man/Makefile.inc b/gnu/usr.bin/man/Makefile.inc
index fa1ad78db23b..7da63dce129a 100644
--- a/gnu/usr.bin/man/Makefile.inc
+++ b/gnu/usr.bin/man/Makefile.inc
@@ -7,9 +7,9 @@ libdir=			/etc
 bindir=			${BINDIR}
 pager=			more -s
 manpath_config_file=	/etc/manpath.config
-troff=			/usr/bin/groff -S -mandoc
+troff=			/usr/bin/groff -S -man
 # -Tascii or localized encoding added automatically
-nroff=                  /usr/bin/groff -S -Wall -mtty-char -mandoc
+nroff=                  /usr/bin/groff -S -Wall -mtty-char -man
 apropos=		/usr/bin/apropos
 whatis=			/usr/bin/whatis
 eqn=                    /usr/bin/eqn
diff --git a/gnu/usr.bin/man/catman/catman.perl b/gnu/usr.bin/man/catman/catman.perl
index 5b51d2ff39d7..3eeafed523f8 100644
--- a/gnu/usr.bin/man/catman/catman.perl
+++ b/gnu/usr.bin/man/catman/catman.perl
@@ -337,7 +337,7 @@ sub garbage {
 
 sub nroff {
     local($man,$cat) = @_;
-    local($nroff) = "nroff -T" . $dev_name . " -mandoc | col";
+    local($nroff) = "nroff -T" . $dev_name . " -man | col";
     local($dev, $ino) = (stat($man))[01];
 
     # It's a link
@@ -386,12 +386,12 @@ sub nroff_device {
   $dev_name = "ascii";
 
   if ($locale) {
-     # Use "nroff -Tkoi8-r -mandoc" to format russian manpages (if catman "-L"
+     # Use "nroff -Tkoi8-r -man" to format russian manpages (if catman "-L"
      # option specified only).
      if ($local_suffix =~ '\.KOI8-R$') {
           $dev_name = "koi8-r";
      }
-     # Use "nroff -Tlatin1 -mandoc" to format ISO 8859-1 manpages
+     # Use "nroff -Tlatin1 -man" to format ISO 8859-1 manpages
      elsif ($local_suffix =~ '\.ISO_8859-1$') {
 	  $dev_name = "latin1";
     }