diff --git a/jOOQ-manual/src/main/resources/org/jooq/web/epub-s04.xsl b/jOOQ-manual/src/main/resources/org/jooq/web/epub-s04.xsl
index 43454a45fe..ef4f87f698 100644
--- a/jOOQ-manual/src/main/resources/org/jooq/web/epub-s04.xsl
+++ b/jOOQ-manual/src/main/resources/org/jooq/web/epub-s04.xsl
@@ -86,6 +86,18 @@
         <xsl:value-of select="@id"/>
     </xsl:template>
 
+    <xsl:template match="tabs" mode="content">
+        <xsl:apply-templates select="tab" mode="content"/>
+    </xsl:template>
+
+    <xsl:template match="tab">
+        <p>
+            <strong><xsl:value-of select="@title"/></strong>
+        </p>
+
+        <xsl:apply-templates select="node()" mode="content"/>
+    </xsl:template>
+
     <xsl:template match="grammar" mode="content">
         <p>
             The grammar is currently not supported in the EPUB version of the manual. Please visit the HTML documentation to see the grammar.
diff --git a/jOOQ-manual/src/main/resources/org/jooq/web/html-util.xsl b/jOOQ-manual/src/main/resources/org/jooq/web/html-util.xsl
index 55f1132223..ca54196abd 100644
--- a/jOOQ-manual/src/main/resources/org/jooq/web/html-util.xsl
+++ b/jOOQ-manual/src/main/resources/org/jooq/web/html-util.xsl
@@ -92,6 +92,20 @@
         </div>
     </xsl:template>
 
+    <xsl:template match="tabs" mode="content">
+        <xsl:apply-templates select="tab" mode="content"/>
+    </xsl:template>
+
+    <xsl:template match="tab" mode="content">
+        <div class="row col col-100 col-white">
+            <p>
+                <strong><xsl:value-of select="@title"/></strong>
+            </p>
+
+            <xsl:apply-templates select="node()" mode="content"/>
+        </div>
+    </xsl:template>
+
     <xsl:template match="grammar" mode="content">
         <xsl:apply-templates match="rule" mode="grammar-content"/>
     </xsl:template>
diff --git a/jOOQ-manual/src/main/resources/org/jooq/web/pdf.xsl b/jOOQ-manual/src/main/resources/org/jooq/web/pdf.xsl
index 1050dbf329..835b05e22b 100644
--- a/jOOQ-manual/src/main/resources/org/jooq/web/pdf.xsl
+++ b/jOOQ-manual/src/main/resources/org/jooq/web/pdf.xsl
@@ -317,6 +317,22 @@
         <xsl:apply-templates select="@*|node()" mode="content"/>
     </xsl:template>
 
+    <xsl:template match="tabs" mode="content">
+        <xsl:apply-templates select="@*|node()" mode="content"/>
+    </xsl:template>
+
+    <xsl:template match="tab" mode="content">
+        <fo:block xsl:use-attribute-sets="div">
+            <fo:block xsl:use-attribute-sets="p">
+                <fo:inline xsl:use-attribute-sets="strong">
+                    <xsl:value-of select="@title"/>
+                </fo:inline>
+            </fo:block>
+
+            <xsl:apply-templates select="node()" mode="content"/>
+        </fo:block>
+    </xsl:template>
+
 	<xsl:template match="div" mode="content">
 		<fo:block xsl:use-attribute-sets="div">
 			<xsl:apply-templates mode="content"/>