diff --git a/CMakeLists.txt b/CMakeLists.txt
index 922b0b3f4..635d83f7f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -25,17 +25,18 @@ set(CMAKE_INTERPROCEDURAL_OPTIMIZATION YES)
 set(CMAKE_INTERPROCEDURAL_OPTIMIZATION_DEBUG NO)
 
 if(APPLE)
-        set(BUNDLE_NAME qdigidoc4)
-        add_subdirectory( extensions/DigiDocQL )
+    add_subdirectory(extensions/DigiDocQL)
+elseif(WIN32)
+    add_subdirectory(extensions/windows EXCLUDE_FROM_ALL)
 elseif(UNIX)
-        option(ENABLE_KDE "Install KDE service menu (default: TRUE)" TRUE)
-        option(ENABLE_NAUTILUS_EXTENSION "Build Nautilus extension (default: TRUE)" TRUE)
-        if (ENABLE_KDE)
-                add_subdirectory( extensions/kde )
-        endif()
-        if (ENABLE_NAUTILUS_EXTENSION)
-                add_subdirectory( extensions/nautilus )
-        endif()
+    option(ENABLE_KDE "Install KDE service menu (default: TRUE)" TRUE)
+    option(ENABLE_NAUTILUS_EXTENSION "Build Nautilus extension (default: TRUE)" TRUE)
+    if (ENABLE_KDE)
+        add_subdirectory(extensions/kde)
+    endif()
+    if (ENABLE_NAUTILUS_EXTENSION)
+        add_subdirectory(extensions/nautilus)
+    endif()
 endif()
 
 add_subdirectory( common )
diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
index 4c5d5566a..53f3524f9 100644
--- a/client/CMakeLists.txt
+++ b/client/CMakeLists.txt
@@ -146,11 +146,11 @@ if( APPLE )
 		COMMAND cp -a $<TARGET_BUNDLE_DIR:DigiDocQL> $<TARGET_BUNDLE_CONTENT_DIR:${PROGNAME}>/Library/QuickLook
 	)
 	add_custom_target( macdeployqt DEPENDS ${PROGNAME}
-		COMMAND ${_qt5Core_install_prefix}/bin/macdeployqt ${CMAKE_CURRENT_BINARY_DIR}/${PROGNAME}.app
-		COMMAND rm -rf $<TARGET_FILE_DIR:${PROGNAME}>/../PlugIns/bearer
-		COMMAND cp -a /Library/Frameworks/digidocpp.framework $<TARGET_FILE_DIR:${PROGNAME}>/../Frameworks
-		COMMAND rm $<TARGET_FILE_DIR:${PROGNAME}>/../Frameworks/digidocpp.framework/Resources/digidoc-tool
-		COMMAND find $<TARGET_FILE_DIR:${PROGNAME}>/../Frameworks -name Headers | xargs rm -rf
+		COMMAND ${_qt5Core_install_prefix}/bin/macdeployqt $<TARGET_BUNDLE_DIR:${PROGNAME}>
+		COMMAND rm -rf $<TARGET_BUNDLE_CONTENT_DIR:${PROGNAME}>/PlugIns/bearer
+		COMMAND cp -a /Library/Frameworks/digidocpp.framework $<TARGET_BUNDLE_CONTENT_DIR:${PROGNAME}>/Frameworks
+		COMMAND rm $<TARGET_BUNDLE_CONTENT_DIR:${PROGNAME}>/Frameworks/digidocpp.framework/Resources/digidoc-tool
+		COMMAND find $<TARGET_BUNDLE_CONTENT_DIR:${PROGNAME}>/Frameworks -name Headers | xargs rm -rf
 		COMMAND install_name_tool -delete_rpath /Library/Frameworks $<TARGET_FILE:${PROGNAME}>
 		# For QT
 		COMMAND ln -sf digidocpp.framework/Libraries/libcrypto.dylib
diff --git a/extensions b/extensions
index 2e1705b5a..963dfabaf 160000
--- a/extensions
+++ b/extensions
@@ -1 +1 @@
-Subproject commit 2e1705b5a20e20aaef12f80acf1a10e8dfec8f27
+Subproject commit 963dfabaf8592f0e1190dfb8697bc6bba7a3cd33