diff --git a/default.epub b/default.epub
index 4b51f441c..0ac58248f 100644
--- a/default.epub
+++ b/default.epub
@@ -17,15 +17,30 @@ $endfor$
$if(titlepage)$
+$for(title)$
+$if(title.text)$
+ $title.text$
+$else$
$title$
+$endif$
+$endfor$
$if(subtitle)$
$subtitle$
$endif$
$for(author)$
$author$
$endfor$
+$for(creator)$
+ $creator.text$
+$endfor$
+$if(publisher)$
+ $publisher$
+$endif$
$if(date)$
- $date$
+ $date$
+$endif$
+$if(rights)$
+ $rights$
$endif$
$else$
$body$
diff --git a/default.epub3 b/default.epub3
index 6e38b4c77..5e983a21a 100644
--- a/default.epub3
+++ b/default.epub3
@@ -21,18 +21,33 @@ $endfor$
$if(titlepage)$
-
- $title$
+
+$for(title)$
+$if(title.type)$
+ $title.text$
+$else$
+ $title$
+$endif$
+$endfor$
$if(subtitle)$
- $subtitle$
+ $subtitle$
$endif$
$for(author)$
- $author$
+ $author$
$endfor$
-$if(date)$
- $date$
+$for(creator)$
+ $creator.text$
+$endfor$
+$if(publisher)$
+ $publisher$
$endif$
-
+$if(date)$
+ $date$
+$endif$
+$if(rights)$
+ $rights$
+$endif$
+
$else$
$body$
$endif$