diff --git a/format-master.xml b/format-master.xml
index f27a8b7..8b8770e 100755
--- a/format-master.xml
+++ b/format-master.xml
@@ -560,6 +560,25 @@
 			</xsl:choose>
 		</html>
 	</template>
+
+	<template name="chapter-title" match="document/title" mode="chapter">
+		<latex>
+			<xsl:apply-templates/>
+		</latex>
+		<html>
+			<xsl:choose>
+				<xsl:when test="/document/@class = 'tutorial'">
+					<H1><xsl:call-template name="PaperCode"/> Tutorial <xsl:value-of select="//metadata/number"/><xsl:if test="$showanswers='yes'"> Sample Answers</xsl:if>: <BR/><xsl:apply-templates/></H1>
+				</xsl:when>
+				<xsl:when test="/document/@class = 'laboratory'">
+					<H1><xsl:call-template name="PaperCode"/> Lab <xsl:value-of select="//metadata/number"/><xsl:if test="$showanswers='yes'"> Sample Answers</xsl:if>: <BR/><xsl:apply-templates/></H1>
+				</xsl:when>
+				<xsl:otherwise>
+					<H1><xsl:apply-templates/></H1>
+				</xsl:otherwise>
+			</xsl:choose>
+		</html>
+	</template>
 	
 	<template name="document-author" match="document/author"/>
 	<template name="document-date" match="document/date"/>
