diff --git a/snapcraft.yaml b/snapcraft.yaml
index 0c6b7328b..962d13254 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -25,11 +25,18 @@ apps:
     command: usr/bin/digidoc-tool
 
 parts:
+  libdigidocpp:
+    plugin: cmake
+    source: https://github.com/open-eid/libdigidocpp.git
+    stage-packages: [libxalan-c111, libxerces-c3.2, libxml-security-c20]
+    build-packages: [g++, vim-common, libxml-security-c-dev, libssl-dev, zlib1g-dev, xsdcxx]
+    cmake-parameters: [-DCMAKE_INSTALL_PREFIX=/usr, -DCMAKE_FIND_ROOT_PATH=/usr]
   qdigidoc4:
     plugin: cmake
     source: .
-    stage-packages: [opensc-pkcs11, libdigidocpp-tools]
-    build-packages: [libdigidocpp-dev, libssl-dev, libpcsclite-dev, libldap2-dev]
+    stage-packages: [opensc-pkcs11]
+    build-packages: [libssl-dev, libpcsclite-dev, libldap2-dev]
+    after: [libdigidocpp]
     cmake-parameters:
       - -DCMAKE_INSTALL_PREFIX=/usr
-      - "-DCMAKE_FIND_ROOT_PATH=/usr\\;/snap/kde-frameworks-5-91-qt-5-15-3-core20-sdk/current"
+      - "-DCMAKE_FIND_ROOT_PATH=/usr\\;/root/stage\\;/snap/kde-frameworks-5-91-qt-5-15-3-core20-sdk/current"