diff --git a/format-master.xml b/format-master.xml
index d21d99e..1c4e07f 100755
--- a/format-master.xml
+++ b/format-master.xml
@@ -126,6 +126,154 @@
 			<xsl:text>Blackboard</xsl:text>
 		</common>
 	</template>
+	
+	<!--
+		Output a string containing the date that the document was last built. We've implemented this in two parts:
+		
+			1. A "private" internal template that can only be called directly via call-template.
+			
+			2. A "public" template that matches build-date elements in the document.
+		
+		
+		First, the internal template (1 above). This includes all the logic for outputting a build date string in the required form. The only time this should need to be explicitly called is for the automatic build date footers that can appear at the end of a document. 
+		
+		$format: How to format the build date.
+			'short' => Output "YYYY-MM-DD".
+			'long' => Output "YYYY-MM-DD hh:mm:ss". [default]
+			date picture string => Output the date in the specified format (see http://www.w3.org/TR/xslt20/#date-picture-string).
+		
+		$style: The presentation style of the build date.
+			'inline' => Output the build date inline with the surrounding text. [default]
+			'footer' => Output the build date in a footer with some additional text, normally for inclusion at the end of a document.
+	-->
+	<template name="build-date-internal">
+		<common>
+			<xsl:param name="format">long</xsl:param>
+			<xsl:param name="style">inline</xsl:param>
+		</common>
+		<common formats="/html/xhtml/">
+			<xsl:choose>
+				<xsl:when test="$style = 'inline'">
+					<xsl:call-template name="generate-build-date">
+						<xsl:with-param name="format" select="$format" />
+					</xsl:call-template>
+				</xsl:when>
+				<!-- We have to generate the address element as text, because we won't be closing it until much later. -->
+				<xsl:when test="$style = 'footer'">
+					<address>
+						<xsl:value-of select="$cvs-file" />
+						<xsl:text>, last built </xsl:text>
+						<xsl:call-template name="generate-build-date">
+							<xsl:with-param name="format" select="$format" />
+						</xsl:call-template>
+					</address>
+				</xsl:when>
+				<xsl:otherwise>
+					<xsl:message terminate="yes">
+						<xsl:text>Unrecognised value "</xsl:text>
+						<xsl:value-of select="$style" />
+						<xsl:text>" for build-date/$style.</xsl:text>
+					</xsl:message>
+				</xsl:otherwise>
+			</xsl:choose>
+		</common>
+		<common formats="/latex/xelatex/">
+			<xsl:choose>
+				<xsl:when test="$style = 'inline'">
+					<xsl:call-template name="generate-build-date">
+						<xsl:with-param name="format" select="$format" />
+					</xsl:call-template>
+				</xsl:when>
+				<xsl:when test="$style = 'footer'">
+					<xsl:text>\vfill
+					
+					</xsl:text>
+					<xsl:text>{\scriptsize \hfill \verb+</xsl:text>
+					<xsl:value-of select="$cvs-file" />
+					<xsl:text>, last built </xsl:text>
+					<xsl:call-template name="generate-build-date">
+						<xsl:with-param name="format" select="$format" />
+					</xsl:call-template>
+					<xsl:text>+}
+					
+					</xsl:text>
+				</xsl:when>
+				<xsl:otherwise>
+					<xsl:message terminate="yes">
+						<xsl:text>Unrecognised value "</xsl:text>
+						<xsl:value-of select="$style" />
+						<xsl:text>" for build-date/$style.</xsl:text>
+					</xsl:message>
+				</xsl:otherwise>
+			</xsl:choose>
+		</common>
+	</template>
+	
+	<!--
+		Second, the "public" template. This is essentially just a wrapper around the internal template, with some additional logic to handle differences between LaTeX and HTML handling.
+		
+		In particular, we need to consider the case where /document/@auto-latex-build-date = "no", which suppresses the final build-date footer in generated LaTeX documents (which is generated by the internal template above). This is needed to resolve issues with weird footer placement due to floating items like tables and figures. The build date can then be explicitly inserted, if desired, using a build-date element in the document, which will be process by the public template below.
+		
+		This suppression doesn't apply to HTML, so the final auto-generated build-date footer will always be produced in HTML documents, regardless. We therefore want to suppress the processing of explicit build-date elements in HTML documents, otherwise we'll end up with more or less the inverse of the LaTeX situation: build-date footers in weird locations within the document (and probably ill-formed HTML to boot).
+		
+		This template therefore suppresses calls to the internal template where applicable.
+		
+		@format: How to format the build date.
+			'short' => Output "YYYY-MM-DD hh:mm:ss". [default]
+			'long' => Output "Last built: YYYY-MM-DD hh:mm:ss".
+			date picture string => Output the date in the specified format (see http://www.w3.org/TR/xslt20/#date-picture-string).
+		
+		@style: The presentation style of the build date.
+			'inline' => Output the build date inline with the surrounding text. [default]
+			'footer' => Output the build date in a footer, normally for inclusion at the end of a document.
+	-->
+	<template name="build-date" match="build-date">
+		<common formats="/html/xhtml/">
+			<xsl:choose>
+				<xsl:when test="( @style = 'footer' ) and ( /document/@auto-latex-build-date = 'no' )" />
+				<xsl:otherwise>
+					<xsl:call-template name="build-date-internal">
+						<xsl:with-param name="format" select="@format" />
+						<xsl:with-param name="style" select="@style" />
+					</xsl:call-template>
+				</xsl:otherwise>
+			</xsl:choose>
+		</common>
+		<common formats="/latex/xelatex/">
+			<xsl:call-template name="build-date-internal">
+				<xsl:with-param name="format" select="@format" />
+				<xsl:with-param name="style" select="@style" />
+			</xsl:call-template>
+		</common>
+	</template>
+	
+	<!--
+		Finally, a utility template to modularise the generation of the actual date value, as it's identical for all formats.
+		
+		$format: How to format the build date.
+			'short' => Output "YYYY-MM-DD hh:mm:ss". [default]
+			'long' => Output "Last built: YYYY-MM-DD hh:mm:ss".
+			date picture string => Output the date in the specified format (see http://www.w3.org/TR/xslt20/#date-picture-string).
+	-->
+	<template name="generate-build-date">
+		<common>
+			<xsl:param name="format">short</xsl:param>
+			
+			<xsl:choose>
+				<xsl:when test="$format = 'short'">
+					<xsl:value-of select="format-dateTime( $date-built, '[Y,4]-[M,2]-[D,2]' )" />
+				</xsl:when>
+				<xsl:when test="$format = 'long'">
+					<xsl:value-of select="format-dateTime( $date-built, '[Y,4]-[M,2]-[D,2] [H,2]:[m,2]:[s,2]' )" />
+				</xsl:when>
+				<!-- Assume it's a date picture string otherwise. -->
+				<xsl:otherwise>
+					<xsl:value-of select="format-dateTime( $date-built, $format )" />
+				</xsl:otherwise>
+			</xsl:choose>
+		</common>
+	</template>
+
 
 	<!--
 		Plain paragraph.