diff --git a/spec/pom.xml b/spec/pom.xml
index 9c91d6ae..f0bdc169 100644
--- a/spec/pom.xml
+++ b/spec/pom.xml
@@ -14,8 +14,9 @@
 	<description>CDI Specification documentation</description>
 
 	<properties>
-		<asciidoctor-maven.version>1.5.6</asciidoctor-maven.version>
-		<asciidoctorj-pdf.version>1.5.0-alpha.14</asciidoctorj-pdf.version>
+		<asciidoctor-maven.version>2.2.1</asciidoctor-maven.version>
+		<asciidoctorj.version>2.5.2</asciidoctorj.version>
+		<asciidoctorj-pdf.version>1.6.0</asciidoctorj-pdf.version>
 		<!-- asl2 for non-final releases, or final for EFSL -->
 		<license-file>asl2</license-file>
 		<!-- Draft for non-final releases, or Final for spec release -->
@@ -156,6 +157,11 @@
 				<artifactId>asciidoctor-maven-plugin</artifactId>
 				<version>${asciidoctor-maven.version}</version>
 				<dependencies>
+					<dependency>
+						<groupId>org.asciidoctor</groupId>
+						<artifactId>asciidoctorj</artifactId>
+						<version>${asciidoctorj.version}</version>
+					</dependency>
 					<dependency>
 						<groupId>org.asciidoctor</groupId>
 						<artifactId>asciidoctorj-pdf</artifactId>
@@ -189,11 +195,13 @@
 					</execution>
 				</executions>
 				<configuration>
+					<sourceDirectory>src/main/asciidoc</sourceDirectory>
 					<sourceDocumentName>cdi-spec.asciidoc</sourceDocumentName>
-					<sourceHighlighter>coderay</sourceHighlighter>
 					<attributes>
 						<license>${license-file}</license>
 						<revremark>${revremark}</revremark>
+						<imagesdir>images</imagesdir>
+						<source-highlighter>coderay</source-highlighter>
 					</attributes>
 				</configuration>
 			</plugin>
diff --git a/spec/src/main/asciidoc/cdi-spec.asciidoc b/spec/src/main/asciidoc/cdi-spec.asciidoc
index 12a61d41..2ad8322d 100644
--- a/spec/src/main/asciidoc/cdi-spec.asciidoc
+++ b/spec/src/main/asciidoc/cdi-spec.asciidoc
@@ -1,8 +1,8 @@
 = Jakarta Contexts and Dependency Injection
 :author: Jakarta Contexts and Dependency Injection Spec Project lead by Antoine Sabot-Durand
 :email: cdi-dev@eclipse.org
-:revnumber: 3.0
-:revdate: July 30 2020
+:revnumber: 4.0
+:revdate: November 18 2021
 :revremark: Draft
 :version-label!:
 :sectanchors: