diff --git a/format-master.xml b/format-master.xml
index 38acd11..81c8282 100755
--- a/format-master.xml
+++ b/format-master.xml
@@ -256,9 +256,28 @@
 
 	<!-- A quotation. -->
 	<template name="quotation" match="quotation">
-		<latex>\begin{flushright}\itshape <xsl:apply-templates/>\end{flushright}</latex>
+		<latex>
+			<xsl:choose>
+				<xsl:when test="(@align = 'left') or (@align = 'right')">
+					\begin{flush<xsl:value-of select="@align"/>}\itshape <xsl:apply-templates/>\end{flush<xsl:value-of select="@align"/>}
+				</xsl:when>
+				<xsl:when test="@align = 'center'">
+					\begin{center}\itshape <xsl:apply-templates/>\end{center}
+				</xsl:when>
+				<xsl:otherwise>
+					\begin{quote}\itshape <xsl:apply-templates/>\end{quote}
+				</xsl:otherwise>
+			</xsl:choose>
+		</latex>
 		<html>
-			<P align="right"><I><xsl:apply-templates/></I></P>
+			<P>
+				<xsl:if test="@align">
+					<xsl:attribute name="ALIGN">
+						<xsl:value-of select="@align"/>
+					</xsl:attribute>
+				</xsl:if>
+				<I><xsl:apply-templates/></I>
+			</P>
 		</html>
 	</template>
 	
