diff --git a/CMakeLists.txt b/CMakeLists.txt
index e7f2c97bf..453d7fdc9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.10)
 if(POLICY CMP0074)
     cmake_policy(SET CMP0074 NEW)
 endif()
-project(qdigidoc4 VERSION 4.2.12)
+project(qdigidoc4 VERSION 4.2.13)
 
 set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
diff --git a/README.md b/README.md
index 0204c20d7..2888b4357 100644
--- a/README.md
+++ b/README.md
@@ -18,7 +18,7 @@
    * Add custom RIA repository to APT repository list
 
          curl https://installer.id.ee/media/install-scripts/C6C83D68.pub | gpg --dearmor | tee /etc/apt/trusted.gpg.d/ria-repository.gpg > /dev/null
-         sudo echo "deb http://installer.id.ee/media/ubuntu/ $(lsb_release -sc) main" > /etc/apt/sources.list.d/ria-repository.list
+         echo "deb http://installer.id.ee/media/ubuntu/ $(lsb_release -sc) main" | sudo tee /etc/apt/sources.list.d/ria-repository.list
          sudo apt update
 
    * Install
@@ -37,32 +37,24 @@
 
 3. Configure
 
-        mkdir build
-        cd build
-        cmake ..
+        cmake -B build -S .
 
 4. Build
 
-        make
+        cmake --build build
 
-5. Install
+5. Execute
 
-        sudo make install
-
-6. Execute
-
-        /usr/local/bin/qdigidoc4
+        ./build/client/qdigidoc4
 
 ### macOS
 
 1. Install dependencies from
    * [XCode](https://apps.apple.com/us/app/xcode/id497799835?mt=12)
    * [http://www.cmake.org](http://www.cmake.org)
-   * [http://qt-project.org](http://qt-project.org)
-       Since Qt 5.6 default SSL backend is SecureTransport and this project depends on openssl.
-       See how to build [OSX Qt from source](#building-osx-qt-from-source).
-       
-       Alternatively build Qt with openssl backend using provided [prepare_osx_build_environment.sh](prepare_osx_build_environment.sh) script; by default Qt is built in the `~/cmake_builds` folder but alternate build path can be defined with the `-p` option.
+   * [http://qt-project.org](http://qt-project.org)  
+       Since Qt 5.6 default SSL backend is SecureTransport and this project depends on openssl.  
+       Build Qt with openssl backend using provided [prepare_osx_build_environment.sh](prepare_osx_build_environment.sh) script; by default Qt is built in the `~/cmake_builds` folder but alternate build path can be defined with the `-p` option.
    * [libdigidocpp-*.pkg](https://github.com/open-eid/libdigidocpp/releases)
 
 2. Fetch the source
@@ -72,27 +64,21 @@
 
 3. Configure
 
-        mkdir build
-        cd build
-        cmake -DQt5_DIR="~/cmake_builds/Qt-5.12.10-OpenSSL/lib/cmake/Qt5" ..
+        cmake -DCMAKE_PREFIX_PATH="~/cmake_builds/Qt-6.3.1-OpenSSL/lib/cmake/Qt6" -B build -S .
 
 4. Build
 
-        make
+        cmake --build build
 
-5. Install
-
-        sudo make install
-
-6. Execute
+5. Execute
 
-        open /usr/local/bin/qdigidoc4.app
+        open build/client/qdigidoc4.app
 
 
 ### Windows
 
 1. Install dependencies from
-    * [Visual Studio Community 2017](https://www.visualstudio.com/downloads/)
+    * [Visual Studio Community 2019](https://www.visualstudio.com/downloads/)
     * [http://www.cmake.org](http://www.cmake.org)
     * [http://qt-project.org](http://qt-project.org)
     * [libdigidocpp-*.msi](https://github.com/open-eid/libdigidocpp/releases)
@@ -103,17 +89,15 @@
 
 3. Configure
 
-        mkdir build
-        cd build
-        cmake -G"NMAKE Makefiles" -DQt5_DIR="C:\Qt\5.12.11\msvc2017\lib\cmake\Qt5" ..
+        cmake -G"NMAKE Makefiles" -DCMAKE_PREFIX_PATH="C:\Qt\6.3.1\msvc2019\lib\cmake\Qt6" -B build -S .
 
 4. Build
 
-        nmake
+        cmake --build build
 
 6. Execute
 
-        client\qdigidoc4.exe
+        build\client\qdigidoc4.exe
 
 
 ## Support
diff --git a/cmake b/cmake
index eececc017..587667bbd 160000
--- a/cmake
+++ b/cmake
@@ -1 +1 @@
-Subproject commit eececc017b2d40e025018727afb9d925482e1a14
+Subproject commit 587667bbd3c911a08e8d96b784a4aa3c5c91ccba
diff --git a/qt-macos12.patch b/qt-macos12.patch
deleted file mode 100644
index 8de8aa8a9..000000000
--- a/qt-macos12.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- qtbase-everywhere-src-5.12.11.orig/src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.h   2021-05-18 09:43:52.000000000 +0300
-+++ qtbase-everywhere-src-5.12.11/src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.h        2021-11-26 19:44:43.000000000 +0200
-@@ -43,6 +43,8 @@
- #include <qpa/qplatformgraphicsbuffer.h>
- #include <private/qcore_mac_p.h>
- 
-+#include <CoreGraphics/CGColorSpace.h>
-+
- QT_BEGIN_NAMESPACE
- 
- class QIOSurfaceGraphicsBuffer : public QPlatformGraphicsBuffer