diff --git a/contrib/groff/nroff/psroff.1 b/contrib/groff/nroff/psroff.1
new file mode 100644
index 000000000000..e2291bab49d3
--- /dev/null
+++ b/contrib/groff/nroff/psroff.1
@@ -0,0 +1,46 @@
+.\" Copyright (c) 1997 Wolfram Schneider <wosch@FreeBSD.org>.
+.\" All rights reserved.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\" 1. Redistributions of source code must retain the above copyright
+.\"    notice, this list of conditions and the following disclaimer.
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\"    notice, this list of conditions and the following disclaimer in the
+.\"    documentation and/or other materials provided with the distribution.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.\" $FreeBSD$
+.Dd September 15, 1997
+.Dt PSROFF 1
+.Os
+.Sh NAME
+.Nm psroff
+.Nd "send troff to PostScript printer"
+.Sh SYNOPSIS
+.Nm
+.Op Ar "groff options"
+.Op Ar
+.Sh DESCRIPTION
+The
+.Nm
+program is actually just a shell script which invokes the
+.Xr groff 1
+command to print the troff files to a PostScript printer.
+.Sh SEE ALSO
+.Xr groff 1 ,
+.Xr lpr 1 ,
+.Xr vgrind 1 ,
+.Xr environ 7
diff --git a/contrib/groff/nroff/psroff.man b/contrib/groff/nroff/psroff.man
deleted file mode 100644
index 73b3d05dfc61..000000000000
--- a/contrib/groff/nroff/psroff.man
+++ /dev/null
@@ -1,18 +0,0 @@
-.TH @G@PSROFF @MAN1EXT@ "@MDATE@" "Groff Version @VERSION@"
-.SH NAME
-@g@psroff \- sent troff to PostScript printer
-.SH SYNOPSIS
-.B @g@psroff
-[groff options] [files ...]
-.SH DESCRIPTION
-The
-.B psroff
-program is actually just a shell script which invokes the
-.B groff(1)
-command 
-to print the troff
-.I files
-to a PostScript printer.
-.SH 
-.SH "SEE ALSO"
-.B groff(1), lpr(1), environ(7)
diff --git a/gnu/usr.bin/groff/nroff/Makefile b/gnu/usr.bin/groff/nroff/Makefile
index 231b482ace03..685f0b8ef70d 100644
--- a/gnu/usr.bin/groff/nroff/Makefile
+++ b/gnu/usr.bin/groff/nroff/Makefile
@@ -3,7 +3,7 @@
 SCRIPTS=	nroff.sh psroff.sh
 MAN=		nroff.1 psroff.1
 
-CLEANFILES+=	${MAN}
+CLEANFILES+=	nroff.1
 
 .include <../Makefile.cfg>
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/src/roff/psroff/psroff.1 b/gnu/usr.bin/groff/src/roff/psroff/psroff.1
new file mode 100644
index 000000000000..e2291bab49d3
--- /dev/null
+++ b/gnu/usr.bin/groff/src/roff/psroff/psroff.1
@@ -0,0 +1,46 @@
+.\" Copyright (c) 1997 Wolfram Schneider <wosch@FreeBSD.org>.
+.\" All rights reserved.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\" 1. Redistributions of source code must retain the above copyright
+.\"    notice, this list of conditions and the following disclaimer.
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\"    notice, this list of conditions and the following disclaimer in the
+.\"    documentation and/or other materials provided with the distribution.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.\" $FreeBSD$
+.Dd September 15, 1997
+.Dt PSROFF 1
+.Os
+.Sh NAME
+.Nm psroff
+.Nd "send troff to PostScript printer"
+.Sh SYNOPSIS
+.Nm
+.Op Ar "groff options"
+.Op Ar
+.Sh DESCRIPTION
+The
+.Nm
+program is actually just a shell script which invokes the
+.Xr groff 1
+command to print the troff files to a PostScript printer.
+.Sh SEE ALSO
+.Xr groff 1 ,
+.Xr lpr 1 ,
+.Xr vgrind 1 ,
+.Xr environ 7