diff --git a/modules/titling.xml b/modules/titling.xml
index bf23de4..8d4a299 100644
--- a/modules/titling.xml
+++ b/modules/titling.xml
@@ -34,12 +34,12 @@
 			-->
 			<xsl:if test="/document/subtitle and /document/author">
 				<xsl:text>\\[0.25\baselineskip] \large </xsl:text>
-				<xsl:value-of select="/document/subtitle" />
+				<xsl:apply-templates select="/document/subtitle" mode="title" />
 			</xsl:if>
 			<xsl:text>}</xsl:text>
 			<xsl:if test="/document/subtitle and not( /document/author )">
 				<xsl:text>\author{</xsl:text>
-				<xsl:value-of select="/document/subtitle" />
+				<xsl:apply-templates select="/document/subtitle" mode="title" />
 				<xsl:text>}</xsl:text>
 			</xsl:if>
 		</common>
@@ -161,10 +161,10 @@
 	</template>
 	
 	<!--
-		Document subtitle. This template exists only to catch any embdedded markup within the subtitle.
+		Document subtitle. This template exists only to catch any embdedded markup within the subtitle. Note that this is also used by the LaTeX preamble above.
 	-->
 	<template name="document-subtitle-title" match="document/subtitle" mode="title">
-		<common formats="/html/xhtml/">
+		<common>
 			<xsl:apply-templates />
 		</common>
 	</template>