diff --git a/share/mk/bsd.sgml.mk b/share/mk/bsd.sgml.mk
index 2e5ea56370d9..2bb7f4fd8a17 100644
--- a/share/mk/bsd.sgml.mk
+++ b/share/mk/bsd.sgml.mk
@@ -1,158 +1,194 @@
 #       bsd.sgml.mk - 8 Sep 1995 John Fieber
 #       This file is in the public domain.
 #
-#	$Id: bsd.sgml.mk,v 1.16 1997/05/02 05:02:54 ache Exp $
+#	$Id: bsd.sgml.mk,v 1.17 1997/05/02 05:07:45 ache Exp $
 #
 # The include file <bsd.sgml.mk> handles installing sgml documents.
 # <bsd.prog.mk> includes the file named "../Makefile.inc" if it exists,
 # as well as the include files <bsd.dep.mk> and <bsd.obj.mk>.
 #
 #
 # +++ variables +++
 #
 # DISTRIBUTION	Name of distribution. [doc]
 #
 # FORMATS 	Indicates which output formats will be generated
 #               (ascii, html, latex, latin1, nroff). [html latin1 ascii]
 #
 # LPR		Printer command. [lpr]
 #
+# NOSGMLCOMPRESS	If you do not want SGML formatted documents
+#		be compressed when they are installed. [yes]
+#
+# SCOMPRESS_CMD	Program to compress SGML formatted documents. Output is to
+#		stdout. [${COMPRESS_CMD}]
+#
 # SGMLFLAGS	Flags to sgmlfmt. [${SGMLOPTS}]
 #
 # SGMLFMT	Format sgml files command. [sgmlfmt]
 #
 # Variables DOCOWN, DOCGRP, DOCMODE, DOCDIR, DESTDIR, DISTDIR are
 # set by other Makefiles (e.g. bsd.own.mk)
 #
 #
 # +++ targets +++
 #
 #	all:
 #		Converts sgml files to the specified output format
 #		(see ${FORMATS}).
 #
 #	distribute:
 # 		This is a variant of install, which will
 # 		put the stuff into the right "distribution".
 #
 #	install:
 #		Install formated output.
 #
 #	print:
 #		Print formated output.
 #
 #
 # bsd.obj.mk: clean, cleandir, obj
 #
 
 
 .if exists(${.CURDIR}/../Makefile.inc)
 .include "${.CURDIR}/../Makefile.inc"
 .endif
 
 # FORMATS indicates which output formats will be generated.  See
 # the sgmlfmt(1) man page for a list of valid formats.  
 # If FORMATS is empty, nothing will be built or installed.
 # Use SGMLOPTS to pass extra flags to sgmlfmt(1).
 
 FORMATS?=       html latin1 ascii
 SGMLFLAGS+=	${SGMLOPTS}
 
 VOLUME?=	${.CURDIR:T}
 DOC?=		${.CURDIR:T}
 SRCDIR?=	${.CURDIR}
 DISTRIBUTION?=	doc
 SGMLFMT?=	sgmlfmt
 LPR?=		lpr
 
-DOCS=	${FORMATS:S/^/${DOC}./g}
-CLEANFILES+=	${DOCS}
+NOSGMLCOMPRESS?=	yes
+SCOMPRESS_CMD?=	${COMPRESS_CMD}
+.if !empty(NOSGMLCOMPRESS)
+SCOMPRESS_EXT=
+.else
+SCOMPRESS_EXT?=	${COMPRESS_EXT}
+.endif
+
+_docs=
+.for _xformat in ${FORMATS}
+__xformat=${_xformat}
+.if ${__xformat} == "html"
+_docs+=	${DOC}.${_xformat}
+.else
+_docs+=	${DOC}.${_xformat}${SCOMPRESS_EXT}
+.endif
+.endfor
+
 
 .MAIN:	all
-all:	${DOCS}
+all:	${_docs}
 
 # If FORMATS is empty, do nothing
 .if empty(FORMATS)
 ${DOC}. install- print- clean-:
 .endif
 
 install:	beforeinstall realinstall afterinstall
 
 realinstall: ${FORMATS:S/^/install-/g}
 
 .if !target(print)
 print: ${FORMATS:S/^/print-/g}
 .endif
 
 spell: ${SRCS}
 	(cd ${.CURDIR};  spell ${SRCS} ) | sort | \
 		comm -23 - ${.CURDIR}/spell.ok > ${DOC}.spell
 
 .if !target(distribute)
 distribute:
 	cd ${.CURDIR} ; $(MAKE) install DESTDIR=${DISTDIR}/${DISTRIBUTION} SHARED=copies
 .endif
 
 # For each FORMATS type, define a build, install, clean and print target.
 # Note that there is special case handling for html targets
 # because the number of files generated is generally not possible
 # to predict outside of sgmlfmt(1).
 
 .for _XFORMAT in ${FORMATS}
 
 # XXX This doesn't work:
 #    .if ${_FORMAT} == "foobar"
 # but defining another variable does:  (?!?!)
 
 _FORMAT = ${_XFORMAT}
 
 .if !target(print-${_FORMAT})
 .if ${_FORMAT} == "html"
 print-${_FORMAT}:
 
 .else
-print-${_FORMAT}: ${DOC}.${_FORMAT}
-	${LPR} -P${.TARGET:S/print-//} ${DOC}.${_FORMAT}
+print-${_FORMAT}: ${DOC}.${_FORMAT}${SCOMPRESS_EXT}
+.if !empty(NOSGMLCOMPRESS)
+	${LPR} ${.ALLSRC}
+.else
+	${SCOMPRESS_CMD} -d ${.ALLSRC} | ${LPR}
+.endif
 
 .endif
 .endif
 
 .if !target(install-${_FORMAT})
 .if ${_FORMAT} == "html"
 install-${_FORMAT}:
 	${INSTALL} ${COPY} -o ${DOCOWN} -g ${DOCGRP} -m ${DOCMODE} \
 		${DOC}*.html ${DESTDIR}${DOCDIR}/${VOLUME}
 	if [ -f ${.OBJDIR}/${DOC}.ln ]; then \
 		(cd ${DESTDIR}${DOCDIR}/${VOLUME}; \
 		sh ${.OBJDIR}/${DOC}.ln); \
 	fi
 
 .else
 install-${_FORMAT}:
 	${INSTALL} ${COPY} -o ${DOCOWN} -g ${DOCGRP} -m ${DOCMODE} \
-		${DOC}.${.TARGET:S/install-//} ${DESTDIR}${DOCDIR}/${VOLUME}
-
+		${DOC}.${.TARGET:S/install-//}${SCOMPRESS_EXT} \
+		${DESTDIR}${DOCDIR}/${VOLUME}
 .endif
 .endif
 
 .if !target(${DOC}.${_FORMAT})
+.if ${_FORMAT} != "html" && empty(NOSGMLCOMPRESS)
+${DOC}.${_FORMAT}${SCOMPRESS_EXT}: ${SRCS}
+	${SGMLFMT} -f ${_XFORMAT} ${SGMLFLAGS} ${.CURDIR}/${DOC}.sgml
+	${SCOMPRESS_CMD} ${DOC}.${_XFORMAT} > ${.TARGET}
+.else
 ${DOC}.${_FORMAT}: ${SRCS}
-	${SGMLFMT} -f ${.TARGET:S/${DOC}.//} ${SGMLFLAGS} ${.CURDIR}/${DOC}.sgml
-
+	${SGMLFMT} -f ${_XFORMAT} ${SGMLFLAGS} ${.CURDIR}/${DOC}.sgml
+.endif
 .endif
 
 .if ${_FORMAT} == "html"
 CLEANFILES+= ${DOC}*.html ${DOC}.ln
+.else
+.if empty(NOSGMLCOMPRESS)
+CLEANFILES+= ${DOC}.${_XFORMAT}${SCOMPRESS_EXT} 
+.endif
+CLEANFILES+= ${DOC}.${_XFORMAT}
 .endif
 
 .endfor
 
 
 .for __target in beforeinstall afterinstall maninstall depend _SUBDIR
 .if !target(__target)
 ${__target}:
 .endif
 .endfor
 
 .include <bsd.dep.mk>
 .include <bsd.obj.mk>