diff --git a/libraries/pom.xml b/libraries/pom.xml
index bc40514b2f..da040c9731 100644
--- a/libraries/pom.xml
+++ b/libraries/pom.xml
@@ -180,6 +180,12 @@
             <artifactId>serenity-core</artifactId>
             <version>${serenity.version}</version>
             <scope>test</scope>
+            <exclusions>
+    	        <exclusion>
+                    <groupId>org.asciidoctor</groupId>
+                    <artifactId>asciidoctor-java-integration</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>net.serenity-bdd</groupId>
@@ -323,6 +329,16 @@
             <artifactId>netty-all</artifactId>
             <version>${netty.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.asciidoctor</groupId>
+            <artifactId>asciidoctorj</artifactId>
+            <version>1.5.4</version>
+        </dependency>
+        <dependency>
+            <groupId>org.asciidoctor</groupId>
+            <artifactId>asciidoctorj-pdf</artifactId>
+            <version>1.5.0-alpha.11</version>
+        </dependency>        
 	<!-- OpenNLP -->
         <dependency>
             <groupId>org.apache.opennlp</groupId>
diff --git a/libraries/src/main/java/com/baeldung/asciidoctor/AsciidoctorDemo.java b/libraries/src/main/java/com/baeldung/asciidoctor/AsciidoctorDemo.java
new file mode 100644
index 0000000000..a986c35126
--- /dev/null
+++ b/libraries/src/main/java/com/baeldung/asciidoctor/AsciidoctorDemo.java
@@ -0,0 +1,33 @@
+package com.baeldung.asciidoctor;
+
+import static org.asciidoctor.Asciidoctor.Factory.create;
+import static org.asciidoctor.OptionsBuilder.options;
+
+import java.io.File;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.asciidoctor.Asciidoctor;
+
+public class AsciidoctorDemo {
+
+    private final Asciidoctor asciidoctor;
+
+    public AsciidoctorDemo() {
+        asciidoctor = create();
+    }
+
+    public void generatePDFFromString(final String input) {
+
+        final Map<String, Object> options = options().inPlace(true)
+                .backend("pdf")
+                .asMap();
+
+        final String outfile = asciidoctor.convertFile(new File("sample.adoc"), options);
+    }
+
+    public String generateHTMLFromString(final String input) {
+        final String output = asciidoctor.convert("Hello _Baeldung_!", new HashMap<String, Object>());
+        return output;
+    }
+}
diff --git a/libraries/src/test/java/com/baeldung/asciidoctor/AsciidoctorDemoTest.java b/libraries/src/test/java/com/baeldung/asciidoctor/AsciidoctorDemoTest.java
new file mode 100644
index 0000000000..3e312eb059
--- /dev/null
+++ b/libraries/src/test/java/com/baeldung/asciidoctor/AsciidoctorDemoTest.java
@@ -0,0 +1,13 @@
+package com.baeldung.asciidoctor;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+public class AsciidoctorDemoTest {
+
+    @Test
+    public void givenString_whenConverting_thenResultingHTMLCode() {
+        final AsciidoctorDemo asciidoctorDemo = new AsciidoctorDemo();
+        Assert.assertEquals(asciidoctorDemo.generateHTMLFromString("Hello _Baeldung_!"), "<div class=\"paragraph\">\n<p>Hello <em>Baeldung</em>!</p>\n</div>");
+    }
+}