diff --git a/format-master.xml b/format-master.xml
index ef6660d..5c5cea4 100755
--- a/format-master.xml
+++ b/format-master.xml
@@ -289,6 +289,14 @@
 		<latex>\emph{<xsl:apply-templates/>}</latex>
 		<html><EM><xsl:apply-templates/></EM></html>
 	</template>
+	<!--
+		Emphasis inside answers needs to be handled specially in HTML, as
+		it doesn't just flip-flop automatically like it does in LaTeX.
+	-->
+	<template name="emph-in-answer" match="answer//emph|answer//em">
+		<latex>\emph{<xsl:apply-templates/>}</latex>
+		<html><STRONG><xsl:apply-templates/></STRONG></html>
+	</template>
 	<template name="italic" match="italic">
 		<latex>\textit{<xsl:apply-templates/>}</latex>
 		<html><I><xsl:apply-templates/></I></html>
