diff --git a/format-master.xml b/format-master.xml
index 2b7e5a7..7c779de 100755
--- a/format-master.xml
+++ b/format-master.xml
@@ -482,9 +482,18 @@
 		<latex><xsl:text>\item </xsl:text><xsl:apply-templates/></latex>
 		<html>
 			<xsl:choose>
-				<xsl:when test="count(paragraph|para|p) != 0">
+				<!--
+					Check whether there are actual paragraphs or things that
+					should be treated like paragraphs inside the item. If so,
+					let them worry about inserting the <P> tags.
+				-->
+				<xsl:when test="count(paragraph|para|p|question|answer) != 0">
 					<LI><xsl:apply-templates/></LI>
 				</xsl:when>
+				<!--
+					Otherwise, insert <P> tags surrounding the item content
+					so that the item spacing looks OK.
+				-->
 				<xsl:otherwise>
 					<LI><P><xsl:apply-templates/></P></LI>
 				</xsl:otherwise>
@@ -535,9 +544,37 @@
 
 
 	<!--
+		Question text. This only exists so that we can ensure that appropriate
+		<P> tags are correctly inserted. If this template didn't exist, showing
+		the answers would generate invalid HTML. The answers are enclosed in a
+		<DIV CLASS="answer">...</DIV>. Without this template, the answer markup
+		ends up embedded inside <P>...</P>, which is invalid.
+	-->
+	<template name="question" match="question">
+		<latex><xsl:apply-templates/></latex>
+		<html>
+			<xsl:choose>
+				<!--
+					Check whether there are actual paragraphs inside the question.
+					If so, let them worry about inserting the <P> tags.
+				-->
+				<xsl:when test="count(paragraph|para|p|question|answer) != 0">
+					<xsl:apply-templates/>
+				</xsl:when>
+				<!--
+					Otherwise, insert <P> tags surrounding the question content.
+				-->
+				<xsl:otherwise>
+					<P><xsl:apply-templates/></P>
+				</xsl:otherwise>
+			</xsl:choose>
+		</html>
+	</template>
+
+	
+	<!--
 		Sample answers, which may optionally be excluded from the output.
 	-->
-
 	<template name="answer" match="answer">
 		<latex>
 			<!--
