diff --git a/RELEASE_STEPS.md b/RELEASE_STEPS.md
index 74d4fa54d7..e86ce5b8ea 100644
--- a/RELEASE_STEPS.md
+++ b/RELEASE_STEPS.md
@@ -28,7 +28,7 @@ Create the release artifacts in Maven, and deploy them to Sonatype staging repos
 Note that on Java 16, you must specify `--illegal-access=warn` as a `MAVEN_OPTS` otherwise Kotlin fails to build
 
 ```bash
-$ mvn release:prepare release:perform
+$ MAVEN_OPTS="--illegal-access=warn" mvn release:prepare release:perform
 ```
 
 Change the release version if needed, or just press Enter if the suggested version is good.
diff --git a/docs/pom.xml b/docs/pom.xml
index 126dca391b..dcfda15884 100644
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -203,6 +203,25 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>timestamp-property</id>
+                        <phase>generate-resources</phase>
+                        <goals>
+                            <goal>timestamp-property</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <name>doc.timestamp</name>
+                    <pattern>MM/dd/yyyy HH:mm ZZ</pattern>
+                    <locale>en_US</locale>
+                    <timeZone>America/Los_Angeles</timeZone>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.asciidoctor</groupId>
                 <artifactId>asciidoctor-maven-plugin</artifactId>
@@ -219,10 +238,13 @@
                 <configuration>
                     <sourceDirectory>src/adoc</sourceDirectory>
                     <sourceDocumentName>index.adoc</sourceDocumentName>
-                    <backend>html</backend>
+                    <backend>html5</backend>
                     <sourceHighlighter>coderay</sourceHighlighter>
                     <attributes>
                         <project_version>${project.version}</project_version>
+                        <revnumber>${project.version}</revnumber>
+                        <revdate>${doc.timestamp}</revdate>
+                        <docdatetime>${doc.timestamp}</docdatetime>
                     </attributes>
                 </configuration>
             </plugin>
diff --git a/docs/publish-docs.sh b/docs/publish-docs.sh
index d341116e87..99a51e92ef 100755
--- a/docs/publish-docs.sh
+++ b/docs/publish-docs.sh
@@ -1,4 +1,4 @@
 #!/bin/sh
 DOC_OPTS="-Dbasepom.check.skip-all=true -Dbasepom.check.skip-javadoc=false -DskipTests"
-mvn ${DOC_OPTS} clean install
-mvn ${DOC_OPTS} -Ppublish-docs -pl :jdbi3-docs clean deploy
+MAVEN_OPTS="--illegal-access=warn" mvn ${DOC_OPTS} clean install
+MAVEN_OPTS="--illegal-access=warn" mvn ${DOC_OPTS} -Ppublish-docs -pl :jdbi3-docs clean deploy