diff --git a/dk.gov.oiosi.library/build.xml b/dk.gov.oiosi.library/build.xml
index bf93713806605b7da25754b47aa27f13e438a3ef..e2f71979729fcff9dce6ccdea9f13db1e6b6ca2b 100644
--- a/dk.gov.oiosi.library/build.xml
+++ b/dk.gov.oiosi.library/build.xml
@@ -4,6 +4,7 @@
     <property name="agent.name" value="Manual generated"/>
     <!-- build.number is a fetched from Gitlab using the SHA commit identifier-->
     <exec executable="git" outputproperty="build.number">
+
         <arg value="rev-parse"/>
         <arg value="--short"/>
         <arg value="HEAD"/>
@@ -21,7 +22,7 @@
     <property name="dir.target.bin" location="${dir.target}/classes"/>
     <property name="dir.test.target.bin" location="${dir.target}/classes-test"/>
     <property name="dir.target.javadoc" location="${dir.target}/javadoc"/>
-    <property name="dir.target.adoc" location="${dir.target}/asciidoctor"/>
+    <property name="dir.target.adoc" location="${dir.target}/documentation"/>
 
     <property name="dir.doc" value="doc"/>
     <property name="dir.lib" value="lib"/>
@@ -31,6 +32,9 @@
     <property name="dir.src" value="src"/>
     <property name="dir.test.src" value="test/src"/>
 
+    <property name="common.adoc.path" value="common/_common_adoc"/>
+    <property name="dir.adoc.resource.path" value="doc"/>
+
     <property name="name.rasp.jar" value="dk.gov.oiosi.library-${version.number}.jar"/>
     <property name="name.rasp.code.zip" value="dk.gov.oiosi.library-${version.number}-src.zip"/>
     <property name="name.rasp.bin.zip" value="dk.gov.oiosi.library-${version.number}-bin.zip"/>
@@ -121,18 +125,77 @@
         </javac>
     </target>
 
-    <target name="compile_adoc" depends="injectVersionNumber, compile" description="Compile the adoc documentation.">
+
+    <target name="compile_adoc" depends="clean, init, injectVersionNumber" description="Compile the adoc documentation into pdf.">
         <mkdir dir="${dir.target.adoc}"/>
-        <asciidoctor:convert
-                sourcedirectory="doc"
-                outputdirectory="${dir.target.adoc}"
-                imagesdir=""
-                sourceDocumentName="OIORASP_Java_ReleaseNotes.adoc"
-                backend="html"
-                doctype="book"
-                relativeBaseDir="true"
-                safemode="unsafe"/>
+        <!-- Compile for PDF: -->
+        <antcall target="compile.adoc.PDF">
+            <param name="docName" value="OIORASP_Java_InstallationGuide.adoc"/>
+        </antcall>
+
+        <antcall target="compile.adoc.PDF">
+            <param name="docName" value="OIORASP_Java_ReleaseNotes.adoc"/>
+        </antcall>
+
+        <antcall target="compile.adoc.PDF">
+            <param name="docName" value="OIORASP_Java_Tutorials.adoc"/>
+        </antcall>
     </target>
+    <target name="compile.adoc.PDF">
+        <echo message="Compiling PDF for ${docName}"/>
+        <property environment="env"/>
+        <echo message="DEBUG: os.name = ${os.name}"/>
+
+        <exec executable="asciidoctor-pdf" os="Mac OS X">
+            <!--arg value="-require"/>
+            <arg value="asciidoctor-pdf"/-->
+
+            <arg value="--backend"/>
+            <arg value="pdf"/>
+
+            <arg value="--doctype"/>
+            <arg value="book"/>
+
+            <arg value="--out-file"/>
+            <arg value="${dir.target.adoc}/${docName}.pdf"/>
+
+            <arg value="-a"/>
+            <arg value="pdf-theme=${common.adoc.path}/erst-styling.yml"/>
+
+            <arg value="-a"/>
+            <arg value="pdf-fontsdir=${common.adoc.path}/fonts/;GEM_FONTS_DIR"/>
+
+            <!--            <arg value="&#45;&#45;trace"/>-->
+
+            <arg value="${dir.adoc.resource.path}/${docName}"/>
+        </exec>
+
+        <exec executable="cmd" os="windows,Windows 10,Windows Server 2012 R2">
+            <arg line="/c asciidoctor-pdf"/>
+            <!--arg value="-require"/>
+            <arg value="asciidoctor-pdf"/-->
+
+            <arg value="--backend"/>
+            <arg value="pdf"/>
+
+            <arg value="--doctype"/>
+            <arg value="book"/>
+
+            <arg value="--out-file"/>
+            <arg value="${dir.target.adoc}/${docName}.pdf"/>
+
+            <arg value="-a"/>
+            <arg value="pdf-theme=${common.adoc.path}/erst-styling.yml"/>
+
+            <arg value="-a"/>
+            <arg value="pdf-fontsdir=${common.adoc.path}/fonts/;GEM_FONTS_DIR"/>
+
+            <arg value="-v"/>
+
+            <arg value="${dir.adoc.resource.path}/${docName}"/>
+        </exec>
+    </target>
+
 
     <target name="javadoc" description="Create Java documentation for browsing">
         <mkdir dir="${dir.target.javadoc}"/>
@@ -313,6 +376,7 @@
         <zip destfile="${dir.target}/${name.rasp.code.zip}">
             <fileset dir="./">
                 <include name="axis2/**"/>
+                <include name="${dir.target.adoc}/*"/>
                 <include name="${dir.doc}/*"/>
                 <include name="lib/**"/>
                 <include name="${dir.resource}/**"/>
diff --git a/dk.gov.oiosi.library/doc/OIORASP_Java_ReleaseNotes.adoc b/dk.gov.oiosi.library/doc/OIORASP_Java_ReleaseNotes.adoc
index e2663e07064df792ea334a78ebc8021be4b41d2b..212051e95dda4769598496bb44f241380d39d0f6 100644
--- a/dk.gov.oiosi.library/doc/OIORASP_Java_ReleaseNotes.adoc
+++ b/dk.gov.oiosi.library/doc/OIORASP_Java_ReleaseNotes.adoc
@@ -1,9 +1,5 @@
 include::_common-settings.adoc[]
 
-Nemhandel OIORASP Java
-v{versionNumber}
-
-
 = OIORASP Java Release Notes
 
 == Introduction
@@ -24,20 +20,20 @@ Documentation:
 * OIORASP_Java_InstallationGuide.pdf
 * OIORASP Library for Java Tutorials.pdf
 * release-notes-2.1.0_HowToUpgrade.txt
-* A number of detailed release-notes related to specific issues – named release-notes-<version>_<issue summary>.txt
+* A number of detailed release-notes related to specific issues named release-notes-_.txt
 
 Samples in GIT repository: https://rep.erst.dk/git/openebusiness/library/java/-/tree/master/dk.gov.oiosi.examples.client :
 
-* dk.firma.klient.webservice.TestCertificate – Test certificates using RASP functionality
-* dk.firma.klient.webservice.OiosiRaspClient – Send a test document
-* dk.firma.klient.webservice.TestUddiLookup – Test UDDI lookup
+* dk.firma.klient.webservice.TestCertificate Test certificates using RASP functionality
+* dk.firma.klient.webservice.OiosiRaspClient Send a test document
+* dk.firma.klient.webservice.TestUddiLookup Test UDDI lookup
 
 
 Source code and binary release (jar file).
 
 [#what_is_changed]
 == What is changed?
-In the following part of the document, some issue numbers are mentioned – these numbers are internal numbers used by Nemhandel and Danish Business Authority, so please ignore these as external developer.
+In the following part of the document, some issue numbers are mentioned these numbers are internal numbers used by Nemhandel and Danish Business Authority, so please ignore these as external developer.
 
 include::release-notes-3.0.0.adoc[leveloffset=+1]
 
@@ -46,8 +42,6 @@ include::release-notes-2.1.x.adoc[leveloffset=+1]
 // include::release-notes-1.x.x.adoc[leveloffset=+1]
 
 
-
-
 == System Requirements
 See OIORASP_Java_InstallationGuide.adoc
 
@@ -68,22 +62,22 @@ Some source code is licensed under the Mozilla Public License Version 1.1. The u
 [source]
 /*
 * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this
- * file except in compliance with the License. You may obtain
- * a copy of the License at http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an
- * "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express
- * or implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- *
- * The Original Code is Java RASP toolkit.
- *
- * The Initial Developer of the Original Code is Lenio. Portions
- * created by Lenio are Copyright (C) 2007 Danish National IT and
- * Telecom Agency (http://www.digst.dk). All Rights Reserved.
- * */
-
-
-Licenses for external dependencies distributed with the RASP library can be found under the /lib folder.
+* License Version 1.1 (the "License"); you may not use this
+* file except in compliance with the License. You may obtain
+* a copy of the License at http://www.mozilla.org/MPL/
+*
+* Software distributed under the License is distributed on an
+* "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express
+* or implied. See the License for the specific language governing
+* rights and limitations under the License.
+*
+*
+* The Original Code is Java RASP toolkit.
+*
+* The Initial Developer of the Original Code is Lenio. Portions
+* created by Lenio are Copyright (C) 2007 Danish National IT and
+* Telecom Agency (http://www.digst.dk). All Rights Reserved.
+* */
+
+
+Licenses for external dependencies distributed with the RASP library can be found under the /lib folder.
\ No newline at end of file
diff --git a/dk.gov.oiosi.library/test/src/dk/gov/oiosi/security/revocation/ocsp/OcspLookupTest.java b/dk.gov.oiosi.library/test/src/dk/gov/oiosi/security/revocation/ocsp/OcspLookupTest.java
index cbead31d93bf7542d52848b1b489b60de5ec5f82..b37e50d86684bb9655989edd7dfea64bbd37da2d 100644
--- a/dk.gov.oiosi.library/test/src/dk/gov/oiosi/security/revocation/ocsp/OcspLookupTest.java
+++ b/dk.gov.oiosi.library/test/src/dk/gov/oiosi/security/revocation/ocsp/OcspLookupTest.java
@@ -21,8 +21,10 @@ package dk.gov.oiosi.security.revocation.ocsp;
 
 import dk.gov.oiosi.AbstractTestCase;
 import dk.gov.oiosi.TestConstants;
+import dk.gov.oiosi.configuration.ConfigurationException;
 import dk.gov.oiosi.configuration.ConfigurationHandler;
 import dk.gov.oiosi.configuration.ConfigurationHandlerCleaner;
+import dk.gov.oiosi.security.CertificateHandlingException;
 import dk.gov.oiosi.security.CertificateSubject;
 import dk.gov.oiosi.security.ldap.LdapCertificateLookup;
 import dk.gov.oiosi.security.ldap.LdapCertificateNotFoundException;
@@ -34,15 +36,14 @@ import dk.gov.oiosi.security.revocation.RevocationResponse;
 import org.bouncycastle.cert.ocsp.OCSPReq;
 import org.junit.Test;
 
+import javax.management.ObjectName;
 import java.io.FileInputStream;
 import java.io.InputStream;
+import java.net.URISyntaxException;
 import java.security.KeyStore;
 import java.security.cert.CertificateFactory;
 import java.security.cert.X509Certificate;
-import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.List;
-import java.util.Random;
+import java.util.*;
 
 /**
  * Testing certificate revocation against OCSP.