diff --git a/data/templates/default.tei b/data/templates/default.tei
index 824c9f0e7..757347886 100644
--- a/data/templates/default.tei
+++ b/data/templates/default.tei
@@ -9,9 +9,23 @@ $for(author)$
 $endfor$
     </titleStmt>
     <publicationStmt>
+$if(publicationStmt)$
       <p>$if(publicationStmt)$$publicationStmt$$endif$</p>
-      $if(license)$
+$endif$
+$if(license)$
       <availability><licence>$license$</licence></availability>
+$endif$
+$if(publisher)$
+      <publisher>$publisher$</publisher>
+$endif$
+$if(pubPlace)$
+      <pubPlace>$pubPlace$</pubPlace>
+$endif$
+$if(address)$
+      <address>$address$</address>
+$endif$
+$if(date)$
+      <date>$date$</date>
 $endif$
     </publicationStmt>
     <sourceDesc>
diff --git a/test/writer.tei b/test/writer.tei
index 779aa337b..587a6fcca 100644
--- a/test/writer.tei
+++ b/test/writer.tei
@@ -8,8 +8,8 @@
       <author>Anonymous</author>
     </titleStmt>
     <publicationStmt>
-      <p></p>
-          </publicationStmt>
+      <date>July 17, 2006</date>
+    </publicationStmt>
     <sourceDesc>
       <p>Produced by pandoc.</p>
     </sourceDesc>