diff --git a/share/misc/docbook.css b/share/misc/docbook.css
index 8b1701e809..e982575fbd 100644
--- a/share/misc/docbook.css
+++ b/share/misc/docbook.css
@@ -26,6 +26,79 @@
  * $FreeBSD$
  */
 
+/*
+ * General DocBook styles from the DocBook XSL distribution
+ */
+
+.formalpara-title {
+  font-weight: bold;
+}
+
+div.blockquote-title {
+  font-weight: bold;
+  margin-top: 1em;
+  margin-bottom: 1em;
+}
+
+span.msgmain-title {
+  font-weight: bold;
+}
+
+span.msgsub-title {
+  font-weight: bold;
+}
+
+span.msgrel-title {
+  font-weight: bold;
+}
+
+div.msglevel, div.msgorig, div.msgaud {
+  margin-top: 1em;
+  margin-bottom: 1em;
+}
+
+span.msglevel-title, span.msgorig-title, span.msgaud-title {
+  font-weight: bold;
+}
+
+div.msgexplan {
+  margin-top: 1em;
+  margin-bottom: 1em;
+}
+
+span.msgexplan-title {
+  font-weight: bold;
+}
+
+div.figure-title {
+  font-weight: bold;
+}
+
+div.example-title {
+  font-weight: bold;
+}
+
+div.equation-title {
+  font-weight: bold;
+}
+
+div.table-title {
+  font-weight: bold;
+}
+
+div.sidebar-title {
+  font-weight: bold;
+}
+
+div.synopsis {
+  white-space: pre;
+  font-family: monospace;
+}
+
+/*
+ * FreeBSD-specific formatting
+ */
+
 body address {
 	line-height: 1.3;
 	margin: .6em 0;
@@ -158,11 +231,15 @@ html {
 	text-decoration: underline;
 }
 
-.screen {
+div.screen {
+	white-space: pre;
+	font-family: monospace;
 	padding: 1ex;
 }
 
-.programlisting {
+div.programlisting {
+	white-space: pre;
+	font-family: monospace;
 	padding: 1ex;
 	background-color: #eee;
 	border: 1px solid #ccc;
diff --git a/share/xsl/freebsd-xhtml-common.xsl b/share/xsl/freebsd-xhtml-common.xsl
index 047236968c..d90ed92bb2 100644
--- a/share/xsl/freebsd-xhtml-common.xsl
+++ b/share/xsl/freebsd-xhtml-common.xsl
@@ -28,6 +28,7 @@
 
   <xsl:param name="make.valid.html" select="1"/>
   <xsl:param name="html.cleanup" select="1"/>
+  <xsl:param name="make.clean.html" select="1"/>
 
   <xsl:param name="local.l10n.xml" select="document('')"/>
   <i18n xmlns="http://docbook.sourceforge.net/xmlns/l10n/1.0">