--- a/usr/src/doc/Makefile.doc	Mon Aug 01 14:12:59 2011 -0700
+++ b/usr/src/doc/Makefile.doc	Wed Aug 03 13:07:44 2011 -0700
@@ -28,14 +28,10 @@
 # The location of the DocBook XSL stylesheets to use.  Most systems
 # should provide a catalog which automatically maps from the
 # DOCBOOK_XSL URL to a local path.
-#
-# STYLESHEET would ideally be set to profile-docbook.xsl, but the
-# stylesheets shipped with Solaris are old and broken.  The effect
-# is that the STATUS variable, described below, doesn't work.
 
 DOCBOOK_XSL=	http://docbook.sourceforge.net/release/xsl/current
 
-STYLESHEET=	docbook.xsl
+STYLESHEET=	profile-docbook.xsl
 FO_XSL=		$(DOCBOOK_XSL)/fo/$(STYLESHEET)
 HTML_XSL=	$(DOCBOOK_XSL)/html/$(STYLESHEET)
 MAN_XSL=	$(DOCBOOK_XSL)/manpages/$(STYLESHEET)
@@ -43,8 +39,7 @@
 # The sections of the documentation that make comments intended for an
 # internal audience are given a status of "private".  Setting STATUS to
 # something other than "private" will cause those sections to be
-# eliminated from the generated output.  Currently broken (see
-# STYLESHEET comment, above.)
+# eliminated from the generated output.
 
 STATUS=	private
 DBOPTS=	\
@@ -58,10 +53,12 @@
 # We assume xsltproc, xmllint, and Apache fop are all in the user's
 # path.
 
-XSLTPROC=	xsltproc --xinclude --nonet $(DBOPTS)
+XSLTPROC=	xsltproc --xinclude --nonet
 XMLLINT=	xmllint --xinclude --postvalid --noout
+
+DBXSLTPROC=	$(XSLTPROC) $(DBOPTS)
 FOP=		fop
 
 # Commands
 
-XSLT.man = $(XSLTPROC) $(MAN_XSL) $<
+XSLT.man = $(DBXSLTPROC) $(MAN_XSL) $<