diff --git a/lib/document/document-converter.js b/lib/document/document-converter.js
index 34a252c0..7e027536 100644
--- a/lib/document/document-converter.js
+++ b/lib/document/document-converter.js
@@ -486,10 +486,22 @@ ${faDom.css()}
     if (node.getDocumentTitle()) {
       const doc = node.getDocument()
       if (this.hasTitlePage(doc)) {
-        return `<div id="cover" class="title-page front-matter">
-  <h1>${node.getDocumentTitle()}</h1>
-  <h2>${node.getDocument().getAuthor()}</h2>
+        const docTitle = node.getDocument().getDocumentTitle({ partition: true })
+        //If the document has a subtitle, we split title in h1 / subtitle in h2
+        if (docTitle.hasSubtitle()){
+          return `<div id="cover" class="title-page front-matter">
+  <h1>${docTitle.getMain()}</h1>
+  <h2>${docTitle.getSubtitle()}</h2>
+  <div id="doc-author">${node.getDocument().getAuthor()}</div>
+  <div id="doc-rev-infos">Version ${node.getDocument().getRevisionNumber()}, ${node.getDocument().getRevisionDate()}</div>
+</div>`
+        } else {
+          return `<div id="cover" class="title-page front-matter">
+  <h1>${docTitle.getCombined()}</h1>
+  <div id="doc-author">${node.getDocument().getAuthor()}</div>
+  <div id="doc-rev-infos">Version ${node.getDocument().getRevisionNumber()}, ${node.getDocument().getRevisionDate()}</div>
 </div>`
+        }
       }
       return `<div class="title-document">
   <h1>${node.getDocumentTitle()}</h1>