diff --git a/format-master.xml b/format-master.xml
index 68b0698..6c859b6 100755
--- a/format-master.xml
+++ b/format-master.xml
@@ -526,20 +526,16 @@
 		</latex>
 		<html>
 			<!--
-				Hmm, <DL>s in HTML tend to come out with the spacing a
-				bit wrong (or maybe it's just my browser?). Might using
-				a table be better? Messy if the keyword is long,
-				though, and you don't get a proper hanging indent...
-				
-				Maybe this is something that could be handled in CSS 
-				instead.
+				<DL>s in HTML tend to come out with the spacing a bit
+				wrong (or maybe it's just my browser?). Anyway, they
+				don't appear to be displayed correctly. A more portable
+				solution is to use plain <P>s with CSS margins to
+				control the hanging indent. The tricky part is dealing
+				with embedded <paragraph>s inside the
+				<description-list>. The clever details are handled in
+				the "definition-item" template.
 			-->
-			<DL>
-				<xsl:apply-templates mode="definition-list"/>
-			</DL>
-<!-- 			<TABLE BORDER="0" CELLPADDING="10"> -->
-<!-- 				<xsl:apply-templates/> -->
-<!-- 			</TABLE> -->
+			<xsl:apply-templates mode="definition-list"/>
 		</html>
 	</template>
 
@@ -576,12 +572,66 @@
 			<xsl:apply-templates select="definition|description|discourse|DD|dd"/>
 		</latex>
 		<html>
-			<DT><xsl:apply-templates select="keyword|topic|DT|dt"/></DT>
-			<DD><xsl:apply-templates select="definition|description|discourse|DD|dd"/></DD>
-<!-- 			<TR VALIGN="TOP"> -->
-<!-- 				<TD><P><xsl:apply-templates select="keyword"/></P></TD> -->
-<!-- 				<TD><xsl:apply-templates select="definition|description|discourse"/></TD> -->
-<!-- 			</TR> -->
+			<!--
+				We have to be a little clever here, because we're
+				transforming multiple embedded elements (potentially
+				with embedded <paragraph>s) into one or more <P> tags in
+				the HTML.
+
+				We know that the <keyword> won't have embedded
+				<paragraph>s (it doesn't really make sense, not that we
+				actually check :)  We therefore only need to check the
+				<definition> element for embedded <paragraph>s:
+			-->
+			<xsl:choose>
+				<!--
+					If there are none, just wrap the <keyword> and
+					<definition> within a <P> with a hanging indent and
+					finish. Note the use of child::node[2], because we
+					don't necessarily know what the <definition> is
+					going to be called, but we know that it will
+					(should) always be the second child of the <item>.
+					
+					This is the most common case, so test for it first.
+				-->
+				<xsl:when test="count(child::node()[2]/paragraph|child::node()[2]/p) = 0">
+					<P CLASS="definition1">
+						<xsl:apply-templates select="keyword|topic|DT|dt"/>
+						<xsl:text> </xsl:text>
+						<xsl:apply-templates select="definition|description|discourse|DD|dd"/>
+					</P>
+				</xsl:when>
+				<!--
+					If there is exactly one, do the same, except skip
+					over the processing of the embedded <paragraph> to
+					avoid nested <P>s in the output.
+				-->
+				<xsl:when test="count(child::node()[2]/paragraph|child::node()[2]/p) = 1">
+					<P CLASS="definition1">
+						<xsl:apply-templates select="keyword|topic|DT|dt"/>
+						<xsl:text> </xsl:text>
+						<xsl:apply-templates select="child::node()[2]/paragraph[1]/node()|child::node()[2]/p[1]/node()"/>
+					</P>
+				</xsl:when>
+				<!--
+					If there is more than one, wrap the <keyword> and
+					the first <paragraph> of the <definition> in a
+					hanging <P>, then wrap the remainder in indented,
+					non-hanging <P>s.
+				-->
+				<xsl:otherwise>
+					<P CLASS="definition1">
+						<xsl:apply-templates select="keyword|topic|DT|dt"/>
+						<xsl:text> </xsl:text>
+						<xsl:apply-templates select="child::node()[2]/paragraph[1]/node()|child::node()[2]/p[1]/node()"/>
+					</P>
+					<xsl:for-each select="child::node()[2]/paragraph[position() > 1]|child::node()[2]/p[position() > 1]">
+						<P CLASS="definition2">
+							<xsl:apply-templates select="node()"/>
+						</P>
+					</xsl:for-each>
+				</xsl:otherwise>
+			</xsl:choose>
 		</html>
 	</template>
 	
@@ -596,17 +646,7 @@
 		used within <image>.
 	-->
 	<template name="definition" match="item/definition|item/description|item/discourse|item/DD|item/dd">
-		<latex><xsl:apply-templates/></latex>
-		<html>
-			<xsl:choose>
-				<xsl:when test="count(paragraph|para|p) != 0">
-					<xsl:apply-templates/>
-				</xsl:when>
-				<xsl:otherwise>
-					<P><xsl:apply-templates/></P>
-				</xsl:otherwise>
-			</xsl:choose>
-		</html>
+		<common><xsl:apply-templates/></common>
 	</template>
 
 
