diff --git a/examples/android/app/src/main/java/ee/ria/libdigidocpp/Conf.java b/examples/android/app/src/main/java/ee/ria/libdigidocpp/Conf.java
index 3b2460470..f6733847d 100644
--- a/examples/android/app/src/main/java/ee/ria/libdigidocpp/Conf.java
+++ b/examples/android/app/src/main/java/ee/ria/libdigidocpp/Conf.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 4.0.0
+ * Version 4.0.2
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/examples/android/app/src/main/java/ee/ria/libdigidocpp/ConfV2.java b/examples/android/app/src/main/java/ee/ria/libdigidocpp/ConfV2.java
index 975863e88..f82bdd00d 100644
--- a/examples/android/app/src/main/java/ee/ria/libdigidocpp/ConfV2.java
+++ b/examples/android/app/src/main/java/ee/ria/libdigidocpp/ConfV2.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 4.0.0
+ * Version 4.0.2
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/examples/android/app/src/main/java/ee/ria/libdigidocpp/ConfV3.java b/examples/android/app/src/main/java/ee/ria/libdigidocpp/ConfV3.java
index a8490c246..55864f515 100644
--- a/examples/android/app/src/main/java/ee/ria/libdigidocpp/ConfV3.java
+++ b/examples/android/app/src/main/java/ee/ria/libdigidocpp/ConfV3.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 4.0.0
+ * Version 4.0.2
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/examples/android/app/src/main/java/ee/ria/libdigidocpp/Container.java b/examples/android/app/src/main/java/ee/ria/libdigidocpp/Container.java
index e48ac7bdf..c80157ab1 100644
--- a/examples/android/app/src/main/java/ee/ria/libdigidocpp/Container.java
+++ b/examples/android/app/src/main/java/ee/ria/libdigidocpp/Container.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 4.0.0
+ * Version 4.0.2
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/examples/android/app/src/main/java/ee/ria/libdigidocpp/DataFile.java b/examples/android/app/src/main/java/ee/ria/libdigidocpp/DataFile.java
index adda1defd..252cef199 100644
--- a/examples/android/app/src/main/java/ee/ria/libdigidocpp/DataFile.java
+++ b/examples/android/app/src/main/java/ee/ria/libdigidocpp/DataFile.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 4.0.0
+ * Version 4.0.2
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/examples/android/app/src/main/java/ee/ria/libdigidocpp/DataFiles.java b/examples/android/app/src/main/java/ee/ria/libdigidocpp/DataFiles.java
index 422073121..058d82d53 100644
--- a/examples/android/app/src/main/java/ee/ria/libdigidocpp/DataFiles.java
+++ b/examples/android/app/src/main/java/ee/ria/libdigidocpp/DataFiles.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 4.0.0
+ * Version 4.0.2
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -38,6 +38,8 @@ public synchronized void delete() {
 
   public DataFiles(DataFile[] initialElements) {
     this();
+    reserve(initialElements.length);
+
     for (DataFile element : initialElements) {
       add(element);
     }
diff --git a/examples/android/app/src/main/java/ee/ria/libdigidocpp/DigiDocConf.java b/examples/android/app/src/main/java/ee/ria/libdigidocpp/DigiDocConf.java
index e0264a37c..852bdc672 100644
--- a/examples/android/app/src/main/java/ee/ria/libdigidocpp/DigiDocConf.java
+++ b/examples/android/app/src/main/java/ee/ria/libdigidocpp/DigiDocConf.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 4.0.0
+ * Version 4.0.2
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -77,8 +77,12 @@ public String xsdPath() {
     return digidocJNI.DigiDocConf_xsdPath(swigCPtr, this);
   }
 
-  public void setTSLCert(byte[] tslCert) {
-    digidocJNI.DigiDocConf_setTSLCert(swigCPtr, this, tslCert);
+  public void setTSLCert(byte[] cert) {
+    digidocJNI.DigiDocConf_setTSLCert(swigCPtr, this, cert);
+  }
+
+  public void addTSLCert(byte[] cert) {
+    digidocJNI.DigiDocConf_addTSLCert(swigCPtr, this, cert);
   }
 
   public void setTSLUrl(String url) {
diff --git a/examples/android/app/src/main/java/ee/ria/libdigidocpp/PKCS11Signer.java b/examples/android/app/src/main/java/ee/ria/libdigidocpp/PKCS11Signer.java
index bab748a63..680bb81c8 100644
--- a/examples/android/app/src/main/java/ee/ria/libdigidocpp/PKCS11Signer.java
+++ b/examples/android/app/src/main/java/ee/ria/libdigidocpp/PKCS11Signer.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 4.0.0
+ * Version 4.0.2
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/examples/android/app/src/main/java/ee/ria/libdigidocpp/PKCS12Signer.java b/examples/android/app/src/main/java/ee/ria/libdigidocpp/PKCS12Signer.java
index 77e79d097..4c046d37c 100644
--- a/examples/android/app/src/main/java/ee/ria/libdigidocpp/PKCS12Signer.java
+++ b/examples/android/app/src/main/java/ee/ria/libdigidocpp/PKCS12Signer.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 4.0.0
+ * Version 4.0.2
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/examples/android/app/src/main/java/ee/ria/libdigidocpp/Signature.java b/examples/android/app/src/main/java/ee/ria/libdigidocpp/Signature.java
index 78d643c05..4dd4e069e 100644
--- a/examples/android/app/src/main/java/ee/ria/libdigidocpp/Signature.java
+++ b/examples/android/app/src/main/java/ee/ria/libdigidocpp/Signature.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 4.0.0
+ * Version 4.0.2
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/examples/android/app/src/main/java/ee/ria/libdigidocpp/Signatures.java b/examples/android/app/src/main/java/ee/ria/libdigidocpp/Signatures.java
index 7a13819f7..e4cd29318 100644
--- a/examples/android/app/src/main/java/ee/ria/libdigidocpp/Signatures.java
+++ b/examples/android/app/src/main/java/ee/ria/libdigidocpp/Signatures.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 4.0.0
+ * Version 4.0.2
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -38,6 +38,8 @@ public synchronized void delete() {
 
   public Signatures(Signature[] initialElements) {
     this();
+    reserve(initialElements.length);
+
     for (Signature element : initialElements) {
       add(element);
     }
diff --git a/examples/android/app/src/main/java/ee/ria/libdigidocpp/Signer.java b/examples/android/app/src/main/java/ee/ria/libdigidocpp/Signer.java
index c3a98df8a..c0348d73d 100644
--- a/examples/android/app/src/main/java/ee/ria/libdigidocpp/Signer.java
+++ b/examples/android/app/src/main/java/ee/ria/libdigidocpp/Signer.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 4.0.0
+ * Version 4.0.2
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/examples/android/app/src/main/java/ee/ria/libdigidocpp/StringMap.java b/examples/android/app/src/main/java/ee/ria/libdigidocpp/StringMap.java
index 66d200b36..5c8ab8835 100644
--- a/examples/android/app/src/main/java/ee/ria/libdigidocpp/StringMap.java
+++ b/examples/android/app/src/main/java/ee/ria/libdigidocpp/StringMap.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 4.0.0
+ * Version 4.0.2
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/examples/android/app/src/main/java/ee/ria/libdigidocpp/StringVector.java b/examples/android/app/src/main/java/ee/ria/libdigidocpp/StringVector.java
index fc0776bb7..427a94e02 100644
--- a/examples/android/app/src/main/java/ee/ria/libdigidocpp/StringVector.java
+++ b/examples/android/app/src/main/java/ee/ria/libdigidocpp/StringVector.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 4.0.0
+ * Version 4.0.2
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -38,6 +38,8 @@ public synchronized void delete() {
 
   public StringVector(String[] initialElements) {
     this();
+    reserve(initialElements.length);
+
     for (String element : initialElements) {
       add(element);
     }
diff --git a/examples/android/app/src/main/java/ee/ria/libdigidocpp/XmlConf.java b/examples/android/app/src/main/java/ee/ria/libdigidocpp/XmlConf.java
index 2cc0fbece..a255f2349 100644
--- a/examples/android/app/src/main/java/ee/ria/libdigidocpp/XmlConf.java
+++ b/examples/android/app/src/main/java/ee/ria/libdigidocpp/XmlConf.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 4.0.0
+ * Version 4.0.2
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/examples/android/app/src/main/java/ee/ria/libdigidocpp/XmlConfV2.java b/examples/android/app/src/main/java/ee/ria/libdigidocpp/XmlConfV2.java
index fb73150b7..011f9b719 100644
--- a/examples/android/app/src/main/java/ee/ria/libdigidocpp/XmlConfV2.java
+++ b/examples/android/app/src/main/java/ee/ria/libdigidocpp/XmlConfV2.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 4.0.0
+ * Version 4.0.2
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/examples/android/app/src/main/java/ee/ria/libdigidocpp/XmlConfV3.java b/examples/android/app/src/main/java/ee/ria/libdigidocpp/XmlConfV3.java
index 1df92841d..4db568a6c 100644
--- a/examples/android/app/src/main/java/ee/ria/libdigidocpp/XmlConfV3.java
+++ b/examples/android/app/src/main/java/ee/ria/libdigidocpp/XmlConfV3.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 4.0.0
+ * Version 4.0.2
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/examples/android/app/src/main/java/ee/ria/libdigidocpp/digidoc.java b/examples/android/app/src/main/java/ee/ria/libdigidocpp/digidoc.java
index e983e8ff0..35444ef00 100644
--- a/examples/android/app/src/main/java/ee/ria/libdigidocpp/digidoc.java
+++ b/examples/android/app/src/main/java/ee/ria/libdigidocpp/digidoc.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 4.0.0
+ * Version 4.0.2
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -17,12 +17,20 @@ public static void terminate() {
     digidocJNI.terminate();
   }
 
+  public static String userAgent() {
+    return digidocJNI.userAgent();
+  }
+
   public static String version() {
     return digidocJNI.version();
   }
 
   public static void initializeLib(String appName, String path) {
-    digidocJNI.initializeLib(appName, path);
+    digidocJNI.initializeLib__SWIG_0(appName, path);
+  }
+
+  public static void initializeLib(String appName, String userAgent, String path) {
+    digidocJNI.initializeLib__SWIG_1(appName, userAgent, path);
   }
 
 }
diff --git a/examples/android/app/src/main/java/ee/ria/libdigidocpp/digidocJNI.java b/examples/android/app/src/main/java/ee/ria/libdigidocpp/digidocJNI.java
index 430fa1fbc..ad3fe20d2 100644
--- a/examples/android/app/src/main/java/ee/ria/libdigidocpp/digidocJNI.java
+++ b/examples/android/app/src/main/java/ee/ria/libdigidocpp/digidocJNI.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 4.0.0
+ * Version 4.0.2
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -45,6 +45,7 @@ public class digidocJNI {
   public final static native long ConfV3_instance();
   public final static native String appInfo();
   public final static native void terminate();
+  public final static native String userAgent();
   public final static native String version();
   public final static native void delete_Container(long jarg1);
   public final static native void Container_save__SWIG_0(long jarg1, Container jarg1_, String jarg2);
@@ -253,13 +254,15 @@ public class digidocJNI {
   public final static native String DigiDocConf_verifyServiceUri(long jarg1, DigiDocConf jarg1_);
   public final static native String DigiDocConf_xsdPath(long jarg1, DigiDocConf jarg1_);
   public final static native void DigiDocConf_setTSLCert(long jarg1, DigiDocConf jarg1_, byte[] jarg2);
+  public final static native void DigiDocConf_addTSLCert(long jarg1, DigiDocConf jarg1_, byte[] jarg2);
   public final static native void DigiDocConf_setTSLUrl(long jarg1, DigiDocConf jarg1_, String jarg2);
   public final static native void DigiDocConf_setOCSPUrls(long jarg1, DigiDocConf jarg1_, long jarg2, StringMap jarg2_);
   public final static native void DigiDocConf_setOCSPTMProfiles(long jarg1, DigiDocConf jarg1_, long jarg2, StringVector jarg2_);
   public final static native void DigiDocConf_setVerifyServiceCert(long jarg1, DigiDocConf jarg1_, byte[] jarg2);
   public final static native void DigiDocConf_setVerifyServiceUri(long jarg1, DigiDocConf jarg1_, String jarg2);
   public final static native void delete_DigiDocConf(long jarg1);
-  public final static native void initializeLib(String jarg1, String jarg2);
+  public final static native void initializeLib__SWIG_0(String jarg1, String jarg2);
+  public final static native void initializeLib__SWIG_1(String jarg1, String jarg2, String jarg3);
   public final static native long new_StringVector__SWIG_0();
   public final static native long new_StringVector__SWIG_1(long jarg1, StringVector jarg1_);
   public final static native long StringVector_capacity(long jarg1, StringVector jarg1_);
diff --git a/examples/ios/libdigidocpp.xcodeproj/project.pbxproj b/examples/ios/libdigidocpp.xcodeproj/project.pbxproj
index 5af56d598..42168182e 100644
--- a/examples/ios/libdigidocpp.xcodeproj/project.pbxproj
+++ b/examples/ios/libdigidocpp.xcodeproj/project.pbxproj
@@ -163,7 +163,7 @@
 		4E7663901B5A37AC00672ACF /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1200;
+				LastUpgradeCheck = 1230;
 				ORGANIZATIONNAME = RIA;
 				TargetAttributes = {
 					4E7663971B5A37AC00672ACF = {
diff --git a/patches/MsgCreator b/patches/MsgCreator
index 7e51ad0e3..959444b39 100755
Binary files a/patches/MsgCreator and b/patches/MsgCreator differ
diff --git a/patches/xalan-CMakeLists.txt b/patches/xalan-CMakeLists.txt
deleted file mode 100644
index 634e24147..000000000
--- a/patches/xalan-CMakeLists.txt
+++ /dev/null
@@ -1,45 +0,0 @@
-cmake_minimum_required(VERSION 3.5)
-if(POLICY CMP0074)
-    cmake_policy(SET CMP0074 NEW)
-endif()
-project(xalan-c)
-find_package(XercesC REQUIRED)
-set(CMAKE_INCLUDE_CURRENT_DIR ON)
-
-file(GLOB MSGCREATOR_SOURCES xalanc/Utils/MsgCreator/*.cpp)
-add_executable(MsgCreator ${MSGCREATOR_SOURCES})
-set_target_properties(MsgCreator PROPERTIES EXCLUDE_FROM_ALL yes)
-target_link_libraries(MsgCreator XercesC::XercesC)
-
-add_custom_command(OUTPUT LocalMsgIndex.hpp LocalMsgData.hpp COMMENT "Generating LocalMsgIndex.hpp"
-	COMMAND ${CMAKE_SOURCE_DIR}/MsgCreator -TYPE inmem -LOCALE en_US -OUTDIR ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR}/xalanc/NLS/en_US/XalanMsg_en_US.xlf
-)
-
-add_library(xalanMsg xalanc/Utils/XalanMsgLib/XalanMsgLib.cpp LocalMsgIndex.hpp)
-set_target_properties(xalanMsg PROPERTIES VERSION 111.0)
-target_include_directories(xalanMsg PRIVATE ${XercesC_INCLUDE_DIRS})
-
-add_definitions(-DXALAN_INMEM_MSG_LOADER -DXALAN_USE_XERCES_LOCAL_CODEPAGE_TRANSCODERS)
-file(GLOB SOURCES
-	xalanc/XPath/*.cpp
-	xalanc/PlatformSupport/*.cpp
-	xalanc/DOMSupport/*.cpp
-	xalanc/XalanDOM/*.cpp
-	xalanc/XalanTransformer/*.cpp
-	xalanc/XSLT/*.cpp
-	xalanc/XMLSupport/*.cpp
-	xalanc/XercesParserLiaison/*.cpp
-	xalanc/XalanSourceTree/*.cpp
-	xalanc/XalanExtensions/*.cpp
-	xalanc/XalanEXSLT/*.cpp
-)
-add_library(xalan-c ${SOURCES})
-set_target_properties(xalan-c PROPERTIES VERSION 111.0)
-target_link_libraries(xalan-c xalanMsg XercesC::XercesC)
-
-install(DIRECTORY xalanc DESTINATION include FILES_MATCHING PATTERN "*.hpp")
-install(FILES ${CMAKE_BINARY_DIR}/LocalMsgIndex.hpp DESTINATION include/xalanc/PlatformSupport)
-install(TARGETS xalan-c xalanMsg
-    LIBRARY DESTINATION lib
-    ARCHIVE DESTINATION lib
-)
diff --git a/prepare_osx_build_environment.sh b/prepare_osx_build_environment.sh
index cfbc7374e..1884fdbd1 100755
--- a/prepare_osx_build_environment.sh
+++ b/prepare_osx_build_environment.sh
@@ -2,6 +2,7 @@
 set -e
 
 XERCES_DIR=xerces-c-3.2.3
+XALAN_DIR=xalan_c-1.12
 XMLSEC_DIR=xml-security-c-2.0.2
 XSD=xsd-4.0.0-i686-macosx
 OPENSSL_DIR=openssl-1.1.1h
@@ -123,15 +124,20 @@ function xerces {
 }
 
 function xalan {
-    echo Building xalan-c-1.11
-    if [ ! -f xalan_c-1.11-src.tar.gz ]; then
-        curl -O -L https://archive.apache.org/dist/xalan/xalan-c/sources/xalan_c-1.11-src.tar.gz
+    echo Building ${XALAN_DIR}
+    if [ ! -f ${XALAN_DIR}.tar.gz ]; then
+        curl -O -L https://archive.apache.org/dist/xalan/xalan-c/sources/${XALAN_DIR}.tar.gz
     fi
-    rm -rf xalan-c-1.11
-    tar xf xalan_c-1.11-src.tar.gz
-    cd xalan-c-1.11/c
-    cp ../../patches/xalan-CMakeLists.txt src/CMakeLists.txt
-    cp ../../patches/MsgCreator src
+    rm -rf ${XALAN_DIR}
+    tar xf ${XALAN_DIR}.tar.gz
+    pushd ${XALAN_DIR}
+    sed -ie 's!add_subdirectory(samples)!!' CMakeLists.txt
+    sed -ie 's!add_subdirectory(Tests)!!' CMakeLists.txt
+    sed -ie 's!add_subdirectory(docs/doxygen)!!' CMakeLists.txt
+    sed -ie 's!add_subdirectory(src/xalanc/TestXSLT)!!' CMakeLists.txt
+    sed -ie 's!add_subdirectory(src/xalanc/TestXPath)!!' CMakeLists.txt
+    sed -n '1102,1500!p' src/xalanc/CMakeLists.txt > tmp
+    mv tmp src/xalanc/CMakeLists.txt
     case "${ARGS}" in
     *android*)
       cmake \
@@ -140,10 +146,11 @@ function xalan {
         -DCMAKE_ANDROID_STANDALONE_TOOLCHAIN=${TARGET_PATH} \
         -DCMAKE_ANDROID_ARCH_ABI=${ARCH_ABI} \
         -DCMAKE_INSTALL_PREFIX=${TARGET_PATH} \
-        -DXercesC_ROOT=${TARGET_PATH} \
         -DCMAKE_BUILD_TYPE="Release" \
         -DBUILD_SHARED_LIBS=NO \
-        src && make -s && sudo make install
+        .
+        make -s MsgCreator || cp ../patches/MsgCreator src/xalanc/Utils/MsgCreator
+        make -s && sudo make install
       ;;
     *ios*|*simulator*)
       cmake \
@@ -152,25 +159,25 @@ function xalan {
         -DCMAKE_OSX_SYSROOT=${SYSROOT} \
         -DCMAKE_OSX_ARCHITECTURES="${ARCHS// /;}" \
         -DCMAKE_INSTALL_PREFIX=${TARGET_PATH} \
-        -DXercesC_ROOT=${TARGET_PATH} \
         -DCMAKE_BUILD_TYPE="Release" \
         -DBUILD_SHARED_LIBS=NO \
-        src && make -s && sudo make install
+        . && make -s MsgCreator
+        cp ../patches/MsgCreator src/xalanc/Utils/MsgCreator
+        make -s && sudo make install
       ;;
     *)
       cmake \
         -DCMAKE_MACOSX_RPATH=NO \
         -DCMAKE_INSTALL_PREFIX=${TARGET_PATH} \
-        -DXercesC_ROOT=${TARGET_PATH} \
         -DCMAKE_BUILD_TYPE="Release" \
         -DBUILD_SHARED_LIBS=YES \
-        src && make -s && sudo make install
-      sudo install_name_tool -id ${TARGET_PATH}/lib/libxalanMsg.111.0.dylib ${TARGET_PATH}/lib/libxalanMsg.*.dylib
-      sudo install_name_tool -id ${TARGET_PATH}/lib/libxalan-c.111.0.dylib \
-        -change libxalanMsg.111.0.dylib ${TARGET_PATH}/lib/libxalanMsg.111.0.dylib ${TARGET_PATH}/lib/libxalan-c.*.dylib
+        . && make -s && sudo make install
+      sudo install_name_tool -id ${TARGET_PATH}/lib/libxalanMsg.112.dylib ${TARGET_PATH}/lib/libxalanMsg.*.0.dylib
+      sudo install_name_tool -id ${TARGET_PATH}/lib/libxalan-c.112.dylib \
+        -change libxalanMsg.112.dylib ${TARGET_PATH}/lib/libxalanMsg.112.dylib ${TARGET_PATH}/lib/libxalan-c.*.0.dylib
       ;;
     esac
-    cd ../..
+    popd
 }
 
 function xml_security {
@@ -183,6 +190,7 @@ function xml_security {
     cd ${XMLSEC_DIR}
     sed -ie 's!as_fn_error $? "cannot run test program while cross compiling!$as_echo_n "cannot run test program while cross compiling!' configure
     sed -ie 's!#define XSEC_EXPORT!#define XSEC_EXPORT __attribute__ ((visibility("default")))!' xsec/framework/XSECDefs.hpp
+    sed -ie 's!XALAN_USING_XALAN(\(.*\))!using xalanc::\1;!' xsec/*/*.cpp* xsec/*/*.hpp
     CFLAGS="${CFLAGS} -fvisibility=hidden" \
     CXXFLAGS="${CXXFLAGS} -fvisibility=hidden -fvisibility-inlines-hidden" \
     xerces_CFLAGS="-I${TARGET_PATH}/include" xerces_LIBS="-L${TARGET_PATH}/lib -lxalanMsg -lxalan-c -lxerces-c" \
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 4c790d53f..899682b1a 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -361,29 +361,29 @@ if( FRAMEWORK )
         COMMAND install_name_tool -id 'libxalanMsg.dylib'
             $<TARGET_FILE_DIR:digidocpp>/Libraries/libxalanMsg.dylib
         COMMAND install_name_tool -id 'libxalan-c.dylib'
-            -change '${LIBPATH}/libxalanMsg.111.0.dylib' '@loader_path/libxalanMsg.dylib'
+            -change '${LIBPATH}/libxalanMsg.112.dylib' '@loader_path/libxalanMsg.dylib'
             -change '${LIBPATH}/libxerces-c-3.2.dylib' '@loader_path/libxerces-c.dylib'
             $<TARGET_FILE_DIR:digidocpp>/Libraries/libxalan-c.dylib
         COMMAND install_name_tool -id 'libxml-security-c.dylib'
             -change '${LIBPATH}/libcrypto.1.1.dylib' '@loader_path/libcrypto.dylib'
             -change '${LIBPATH}/libssl.1.1.dylib' '@loader_path/libssl.dylib'
             -change '${LIBPATH}/libxerces-c-3.2.dylib' '@loader_path/libxerces-c.dylib'
-            -change '${LIBPATH}/libxalan-c.111.0.dylib' '@loader_path/libxalan-c.dylib'
-            -change '${LIBPATH}/libxalanMsg.111.0.dylib' '@loader_path/libxalanMsg.dylib'
+            -change '${LIBPATH}/libxalan-c.112.dylib' '@loader_path/libxalan-c.dylib'
+            -change '${LIBPATH}/libxalanMsg.112.dylib' '@loader_path/libxalanMsg.dylib'
             $<TARGET_FILE_DIR:digidocpp>/Libraries/libxml-security-c.dylib
         COMMAND install_name_tool
             -change '${LIBPATH}/libcrypto.1.1.dylib' '@loader_path/Libraries/libcrypto.dylib'
             -change '${LIBPATH}/libssl.1.1.dylib' '@loader_path/Libraries/libssl.dylib'
             -change '${LIBPATH}/libxerces-c-3.2.dylib' '@loader_path/Libraries/libxerces-c.dylib'
             -change '${LIBPATH}/libxml-security-c.20.dylib' '@loader_path/Libraries/libxml-security-c.dylib'
-            -change '${LIBPATH}/libxalan-c.111.0.dylib' '@loader_path/Libraries/libxalan-c.dylib'
+            -change '${LIBPATH}/libxalan-c.112.dylib' '@loader_path/Libraries/libxalan-c.dylib'
             $<TARGET_FILE:digidocpp>
         COMMAND install_name_tool
             -change '${LIBPATH}/libcrypto.1.1.dylib' '@executable_path/../Libraries/libcrypto.dylib'
             -change '${LIBPATH}/libssl.1.1.dylib' '@executable_path/../Libraries/libssl.dylib'
             -change '${LIBPATH}/libxerces-c-3.2.dylib' '@executable_path/../Libraries/libxerces-c.dylib'
             -change '${LIBPATH}/libxml-security-c.20.dylib' '@executable_path/../Libraries/libxml-security-c.dylib'
-            -change '${LIBPATH}/libxalan-c.111.0.dylib' '@executable_path/../Libraries/libxalan-c.dylib'
+            -change '${LIBPATH}/libxalan-c.112.dylib' '@executable_path/../Libraries/libxalan-c.dylib'
             $<TARGET_FILE_DIR:digidocpp>/Resources/digidoc-tool
         COMMAND touch $<TARGET_FILE:digidoc-tool>
     )
diff --git a/src/Container.cpp b/src/Container.cpp
index 129322afc..8f8c87a03 100644
--- a/src/Container.cpp
+++ b/src/Container.cpp
@@ -44,8 +44,13 @@ DIGIDOCPP_WARNING_PUSH
 DIGIDOCPP_WARNING_DISABLE_GCC("-Wunused-parameter")
 #include <xalanc/XalanTransformer/XalanTransformer.hpp>
 DIGIDOCPP_WARNING_POP
+#if XALAN_VERSION_MAJOR == 1 && XALAN_VERSION_MINOR < 12
 XALAN_USING_XALAN(XPathEvaluator)
 XALAN_USING_XALAN(XalanTransformer)
+#else
+using xalanc::XPathEvaluator;
+using xalanc::XalanTransformer;
+#endif
 #endif
 
 #define XSD_CXX11