diff --git a/format-master.xml b/format-master.xml
index 3560fbc..f8f5265 100755
--- a/format-master.xml
+++ b/format-master.xml
@@ -1152,7 +1152,16 @@
 	
 	<!-- Document preamble stuff: title, author, date. -->
 	<template name="preamble-title" match="document/title" mode="preamble">
-		<latex>\title{<xsl:apply-templates />}</latex>
+		<latex>
+			<xsl:text>\title{</xsl:text>
+			<xsl:choose>
+				<xsl:when test="/document/@class = 'assignment'">
+					<xsl:if test="$showanswers='yes'">Sample Solution for </xsl:if>
+				</xsl:when>
+			</xsl:choose>
+			<xsl:apply-templates />
+			<xsl:text>}</xsl:text>
+		</latex>
 		<!--
 			For HTML, strip out any formatting (e.g., emphasis), as this
 			is not interpreted within the <TITLE> tag, resulting in raw
@@ -1196,6 +1205,10 @@
 						<xsl:text>: </xsl:text>
 						<BR />
 					</xsl:when>
+					<xsl:when test="/document/@class = 'assignment'">
+						<xsl:if test="$showanswers='yes'">Sample Solution for </xsl:if>
+						<BR />
+					</xsl:when>
 				</xsl:choose>
 				<xsl:apply-templates />
 			</H1>