diff --git a/project/bundles/3rdparty/ext_libicu/CMakeLists.txt b/project/bundles/3rdparty/ext_libicu/CMakeLists.txt
index d1b3897696..4c0c52c1cf 100644
--- a/project/bundles/3rdparty/ext_libicu/CMakeLists.txt
+++ b/project/bundles/3rdparty/ext_libicu/CMakeLists.txt
@@ -1,27 +1,30 @@
 # Script to build libicu for digiKam bundle.
 #
 # Copyright (c) 2015-2019, Gilles Caulier, <caulier dot gilles at gmail dot com>
 #
 # Redistribution and use is allowed according to the terms of the BSD license.
 # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
 #
 
-SET(EXTPREFIX_libicu "${EXTPREFIX}")
+SET(EXTPREFIX_libicu "${EXTPREFIX}/local")
 
 ExternalProject_Add(ext_libicu
     DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
     URL https://github.com/unicode-org/icu/archive/release-64-2.tar.gz
     URL_MD5 6bab6095784e0d1ede06d6d27df29bf2
 
-    INSTALL_DIR ${EXTPREFIX_libicu}
-
-    CONFIGURE_COMMAND cd <SOURCE_DIR>/icu4c/source && ./configure --prefix ${EXTPREFIX_libicu} --enable-tests=no --enable-samples=no --with-data-packaging=library --disable-renaming
+    CONFIGURE_COMMAND cd <SOURCE_DIR>/icu4c/source &&
+                      ./configure --prefix ${EXTPREFIX_libicu}
+                                  --enable-tests=no
+                                  --enable-samples=no
+                                  --with-data-packaging=library
+                                  --disable-renaming
 
     BUILD_COMMAND cd <SOURCE_DIR>/icu4c/source && $(MAKE)
 
     INSTALL_COMMAND cd <SOURCE_DIR>/icu4c/source && $(MAKE) install
 
     UPDATE_COMMAND ""
     BUILD_IN_SOURCE 1
     ALWAYS 0
 )
diff --git a/project/bundles/3rdparty/ext_qt/CMakeLists.txt b/project/bundles/3rdparty/ext_qt/CMakeLists.txt
index af18711612..c475c0473f 100644
--- a/project/bundles/3rdparty/ext_qt/CMakeLists.txt
+++ b/project/bundles/3rdparty/ext_qt/CMakeLists.txt
@@ -1,98 +1,97 @@
 # Script to build Qt for digiKam bundle.
 #
 # Copyright (c) 2015-2019, Gilles Caulier, <caulier dot gilles at gmail dot com>
 #
 # Redistribution and use is allowed according to the terms of the BSD license.
 # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
 #
 
 SET(EXTPREFIX_qt "${EXTPREFIX}")
 
 IF(NOT ENABLE_QTWEBENGINE)
     SET(DROP_QTWEBENGINE_DEPS
         -skip qtwebengine                 # No need Chromium browser support (QtWebkit instead)
         -skip qtwebchannel                # QtWebChannel support ==> QWebEngine dependency
         -skip qtquickcontrols             # QtQuick support      ==> QWebEngine dependency
         )
 ENDIF()
 
 ExternalProject_Add(ext_qt
     DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
     URL https://download.qt.io/official_releases/qt/5.13/5.13.1/single/qt-everywhere-src-5.13.1.tar.xz
     URL_MD5 d66b1da335d0c25325fdf493e9044c38
 
     PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/qt-icu-hack.patch &&
                   ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/qt-appimage-support.patch
 
-    CMAKE_ARGS -DOPENSSL_LIBS='-L${EXTPREFIX_qt}/lib -lssl -lcrypto'
-
     CONFIGURE_COMMAND <SOURCE_DIR>/configure
+                  ICU_LIBS="-I${EXTPREFIX}/local/ -L${EXTPREFIX}/local/lib -licui18n -licuuc -licudata"
                   -prefix ${EXTPREFIX_qt}
                   -verbose
                   -release
                   -opensource
                   -confirm-license
                   -sql-sqlite                       # Compile Sqlite SQL plugin
                   -sql-mysql                        # Compile Mysql SQL plugin
                   -iconv                            # International string conversion
                   -icu
                   -fontconfig
                   -system-freetype                  # Use system font rendering lib https://doc.qt.io/qt-5/qtgui-attribution-freetype.html
                   -openssl-linked                   # hard link ssl libraries
                   -nomake tests                     # Do not build test codes
                   -nomake examples                  # Do not build basis example codes
                   -no-compile-examples              # Do not build extra example codes
                   -no-qml-debug
                   -no-mtdev
                   -no-journald
                   -no-syslog
                   -no-tslib
                   -no-directfb
                   -no-linuxfb
                   -no-libproxy
                   -no-pch
                   -qt-zlib
                   -qt-pcre
                   -qt-harfbuzz
                   -qt-xcb
                   -skip qt3d                        # 3D core
                   -skip qtactiveqt                  # No need ActiveX support
                   -skip qtandroidextras             # For embeded devices only
                   -skip qtcharts                    # No need data models charts support
                   -skip qtconnectivity              # For embeded devices only
                   -skip qtdatavis3d                 # no need 3D data visualizations support
                   -skip qtdoc                       # No need documentation
                   -skip qtgamepad                   # No need gamepad hardware support.
                   -skip qtgraphicaleffects          # No need Advanced graphical effects in GUI
                   -skip qtlocation                  # No need geolocation
                   -skip qtlottie                    # No need Adobe QtQuick After Effect animations integration
                   -skip qtmacextras                 # For MacOS devices only
                   -skip qtmultimedia                # No need multimedia support (replaced by QtAV+ffmpeg)
                   -skip qtnetworkauth               # No need network authentification support.
                   -skip qtpurchasing                # No need in-app purchase of products support
                   -skip qtquickcontrols2            # QtQuick support for QML
                   -skip qtremoteobjects             # No need sharing QObject properties between processes support
                   -skip qtscript                    # No need scripting (deprecated)
                   -skip qtscxml                     # No need SCXML state machines support
                   -skip qtsensors                   # For embeded devices only
                   -skip qtserialbus                 # No need serial bus support
                   -skip qtserialport                # No need serial port support
                   -skip qtspeech                    # No need speech synthesis support
                   -skip qttranslations              # No need translation tools.
                   -skip qtvirtualkeyboard           # No need virtual keyboard support
                   -skip qtwayland                   # Specific to Linux
                   -skip qtwebglplugin               # No need browser OpenGL extention support
                   -skip qtwebsockets                # No need websocket support
                   -skip qtwebview                   # QML extension for QWebEngine
                   -skip qtwinextras                 # For Windows devices only
                   ${DROP_QTWEBENGINE_DEPS}
 
 
     # Exemple of code to install only one Qt module for hacking purpose (aka qtbase here)
     #BUILD_COMMAND cd <SOURCE_DIR> && $(MAKE) module-qtbase
     #INSTALL_COMMAND cd <SOURCE_DIR> && $(MAKE) module-qtbase-install_subtargets
 
     UPDATE_COMMAND ""
     BUILD_IN_SOURCE 1
     ALWAYS 0
 )