diff --git a/modules/latex.xml b/modules/latex.xml
index 5d1091a..b502b42 100755
--- a/modules/latex.xml
+++ b/modules/latex.xml
@@ -66,21 +66,13 @@
 	-->
 	<template name="latex-documentclass" match="latex-documentclass|documentclass">
 		<common formats="/latex/xelatex/">
-			<xsl:text>\documentclass[</xsl:text>
-			<xsl:value-of select="@options" />
-			<xsl:text>]{</xsl:text>
-			<xsl:value-of select="." />
-			<xsl:text>}</xsl:text>
-			<xsl:call-template name="newline-internal" />
-		</common>
-	</template>
-	
-	<!-- Durr, this is identical to the previous one??? -->
-	<template name="latex-documentclass-options" match="latex-documentclass[@options]|documentclass[@options]">
-		<common formats="/latex/xelatex/">
-			<xsl:text>\documentclass[</xsl:text>
-			<xsl:value-of select="@options" />
-			<xsl:text>]{</xsl:text>
+			<xsl:text>\documentclass</xsl:text>
+			<xsl:if test="@options">
+				<xsl:text>[</xsl:text>
+				<xsl:value-of select="@options" />
+				</xsl:text>]</xsl:text>
+			</xsl:if>
+			<xsl:text>{</xsl:text>
 			<xsl:value-of select="." />
 			<xsl:text>}</xsl:text>
 			<xsl:call-template name="newline-internal" />
@@ -88,7 +80,7 @@
 	</template>
 	
 	<!--
-		Specify additional LaTeX document class options (i.e., in addition to the defaults). These should be a comma-separated list of the required options. These will be appended to the standard defaults (a4paper, 12pt).
+		Specify /additional/ LaTeX document class options (i.e., in addition to the defaults). These should be a comma-separated list of the required options. These will be appended to the standard defaults (a4paper, 12pt).
 	-->
 	<template name="latex-document-options" match="latex-document-options">
 		<common formats="/latex/xelatex/">