diff --git a/pom.xml b/pom.xml
index 01274b055..fce635a9a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -159,7 +159,7 @@
 			<plugin>
 				<groupId>org.asciidoctor</groupId>
 				<artifactId>asciidoctor-maven-plugin</artifactId>
-				<version>2.2.3</version>
+				<version>3.0.0</version>
 				<executions>
 					<execution>
 						<id>generate-docs</id>
@@ -172,12 +172,14 @@
 				<configuration>
 					<backend>html5</backend>
 					<!--preserveDirectories>true</preserveDirectories-->
-					<imagesDir>images</imagesDir>
 					<sourceDirectory>${basedir}/target/docs</sourceDirectory>
 					<sourceDocumentName>index.adoc</sourceDocumentName>
 					<outputDirectory>${basedir}/docs</outputDirectory>
 					<attributes>
 						<neo4j-version>${project.version}</neo4j-version>
+						<imagesdir>images</imagesdir>
+						<source-highlighter>coderay</source-highlighter>
+						<coderay-css>style</coderay-css>
 					</attributes>
 					<requires>
 						<require>asciidoctor-diagram</require>
@@ -204,17 +206,13 @@
 							</includes>
 						</resource>
 					</resources>
-					<source-highlighter>coderay</source-highlighter>
-					<coderay-css>style</coderay-css>
-					<requires>
-						<require>asciidoctor-diagram</require>
-					</requires>
+					<requires>asciidoctor-diagram</requires>
 				</configuration>
 				<dependencies>
 					<dependency>
 						<groupId>org.asciidoctor</groupId>
 						<artifactId>asciidoctorj-diagram</artifactId>
-						<version>2.2.1</version>
+						<version>2.3.0</version>
 					</dependency>
 				</dependencies>
 			</plugin>
diff --git a/src/docs/conf/asciidoc.local.conf b/src/docs/conf/asciidoc.local.conf
index fb71f6f85..2e7209fd5 100644
--- a/src/docs/conf/asciidoc.local.conf
+++ b/src/docs/conf/asciidoc.local.conf
@@ -2,4 +2,4 @@
 imagesdir=images
 iconsdir=icons
 imagestargetdir=target/src/images
-fontsdir=target/tools/bin/fonts
\ No newline at end of file
+fontsdir=target/tools/bin/fonts
diff --git a/src/docs/dev/appendix.txt b/src/docs/dev/appendix.adoc
similarity index 51%
rename from src/docs/dev/appendix.txt
rename to src/docs/dev/appendix.adoc
index 08e1d4237..9f57b3850 100644
--- a/src/docs/dev/appendix.txt
+++ b/src/docs/dev/appendix.adoc
@@ -2,13 +2,13 @@
 
 :leveloffset: 1
 
-include::udig.txt[]
+include::udig.adoc[]
 
 :leveloffset: 1
 
-include::geoserver.txt[]
+include::geoserver.adoc[]
 
 :leveloffset: 1
 
-include::geoserver2.txt[]
+include::geoserver2.adoc[]
 
diff --git a/src/docs/dev/examples.txt b/src/docs/dev/examples.adoc
similarity index 99%
rename from src/docs/dev/examples.txt
rename to src/docs/dev/examples.adoc
index 894b3c04d..2dc3a8603 100644
--- a/src/docs/dev/examples.txt
+++ b/src/docs/dev/examples.adoc
@@ -96,5 +96,5 @@ image::equalLayer.png[]
 
 :leveloffset: 2
 
-include::geo-pipes.txt[]
+include::geo-pipes.adoc[]
 
diff --git a/src/docs/dev/geo-pipes.txt b/src/docs/dev/geo-pipes.adoc
similarity index 100%
rename from src/docs/dev/geo-pipes.txt
rename to src/docs/dev/geo-pipes.adoc
diff --git a/src/docs/dev/geoserver.txt b/src/docs/dev/geoserver.adoc
similarity index 100%
rename from src/docs/dev/geoserver.txt
rename to src/docs/dev/geoserver.adoc
diff --git a/src/docs/dev/geoserver2.txt b/src/docs/dev/geoserver2.adoc
similarity index 100%
rename from src/docs/dev/geoserver2.txt
rename to src/docs/dev/geoserver2.adoc
diff --git a/src/docs/dev/index.adoc b/src/docs/dev/index.adoc
new file mode 100644
index 000000000..d010ae30f
--- /dev/null
+++ b/src/docs/dev/index.adoc
@@ -0,0 +1,21 @@
+
+:leveloffset: 1
+
+include::indexing.adoc[]
+
+:leveloffset: 1
+
+include::layers.adoc[]
+
+:leveloffset: 1
+
+include::procedures.adoc[]
+
+:leveloffset: 1
+
+include::querying.adoc[]
+
+:leveloffset: 1
+
+include::examples.adoc[]
+
diff --git a/src/docs/dev/index.txt b/src/docs/dev/index.txt
deleted file mode 100644
index d4c0f30bc..000000000
--- a/src/docs/dev/index.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-
-:leveloffset: 1
-
-include::indexing.txt[]
-
-:leveloffset: 1
-
-include::layers.txt[]
-
-:leveloffset: 1
-
-include::procedures.txt[]
-
-:leveloffset: 1
-
-include::querying.txt[]
-
-:leveloffset: 1
-
-include::examples.txt[]
-
diff --git a/src/docs/dev/indexing.txt b/src/docs/dev/indexing.adoc
similarity index 100%
rename from src/docs/dev/indexing.txt
rename to src/docs/dev/indexing.adoc
diff --git a/src/docs/dev/introduction.txt b/src/docs/dev/introduction.adoc
similarity index 100%
rename from src/docs/dev/introduction.txt
rename to src/docs/dev/introduction.adoc
diff --git a/src/docs/dev/layers.txt b/src/docs/dev/layers.adoc
similarity index 100%
rename from src/docs/dev/layers.txt
rename to src/docs/dev/layers.adoc
diff --git a/src/docs/dev/procedures.txt b/src/docs/dev/procedures.adoc
similarity index 100%
rename from src/docs/dev/procedures.txt
rename to src/docs/dev/procedures.adoc
diff --git a/src/docs/dev/querying.txt b/src/docs/dev/querying.adoc
similarity index 100%
rename from src/docs/dev/querying.txt
rename to src/docs/dev/querying.adoc
diff --git a/src/docs/dev/udig.txt b/src/docs/dev/udig.adoc
similarity index 100%
rename from src/docs/dev/udig.txt
rename to src/docs/dev/udig.adoc
diff --git a/src/docs/index.adoc b/src/docs/index.adoc
index cdb04ad22..3fcaa5f45 100644
--- a/src/docs/index.adoc
+++ b/src/docs/index.adoc
@@ -8,14 +8,14 @@
 
 :leveloffset: 1
 
-include::dev/introduction.txt[]
+include::dev/introduction.adoc[]
 
 :leveloffset: 1
 
-include::dev/index.txt[]
+include::dev/index.adoc[]
 
 :leveloffset: 1
 
-include::dev/appendix.txt[]
+include::dev/appendix.adoc[]