diff --git a/data/templates/default.rst b/data/templates/default.rst
index 9ba15f546..207967122 100644
--- a/data/templates/default.rst
+++ b/data/templates/default.rst
@@ -1,19 +1,45 @@
 $if(titleblock)$
 $titleblock$
 
-$endif$
 $for(author)$
-:Author: $author$
+:Author: $^$$author$
 $endfor$
-$if(date)$
-:Date:   $date$
+$if(authors)$
+:Authors:
+   $author$
 $endif$
-$if(author)$
-
-$else$
 $if(date)$
-
+:Date: $^$$date$
 $endif$
+$if(address)$
+:Addresss: $^$$address$
+$endif$
+$if(contact)$
+:Contact: $^$$contact$
+$endif$
+$if(copyright)$
+:Copyright: $^$$copyright$
+$endif$
+$if(dedication)$
+:Dedication: $^$$dedication$
+$endif$
+$if(organization)$
+:Organization: $^$$organization$
+$endif$
+$if(revision)$
+:Revision: $^$$revision$
+$endif$
+$if(status)$
+:Status: $^$$status$
+$endif$
+$if(version)$
+:Version: $^$$version$
+$endif$
+$if(abstract)$
+:Abstract:
+   $abstract$
+$endif$
+
 $endif$
 $if(rawtex)$
 .. role:: raw-latex(raw)
diff --git a/test/writer.rst b/test/writer.rst
index 0baaa670c..d4a0f7335 100644
--- a/test/writer.rst
+++ b/test/writer.rst
@@ -4,7 +4,7 @@ Pandoc Test Suite
 
 :Author: John MacFarlane
 :Author: Anonymous
-:Date:   July 17, 2006
+:Date: July 17, 2006
 
 .. role:: raw-latex(raw)
    :format: latex