diff --git a/build-jack.sh b/build-jack.sh
index 8bdeb32..af1c552 100755
--- a/build-jack.sh
+++ b/build-jack.sh
@@ -201,7 +201,11 @@ fi
 
 if [ -f "${PAWPAW_PREFIX}/bin/moc" ]; then
     download qjackctl "${QJACKCTL_VERSION}" https://download.sourceforge.net/qjackctl
-    patch_file qjackctl "${QJACKCTL_VERSION}" "configure" 's/-ljack /-Wl,-Bdynamic -ljack64 -Wl,-Bstatic /'
+    if [ "${WIN64}" -eq 1 ]; then
+        patch_file qjackctl "${QJACKCTL_VERSION}" "configure" 's/-ljack /-Wl,-Bdynamic -ljack64 -Wl,-Bstatic /'
+    elif [ "${WIN32}" -eq 1 ]; then
+        patch_file qjackctl "${QJACKCTL_VERSION}" "configure" 's/-ljack /-Wl,-Bdynamic -ljack -Wl,-Bstatic /'
+    fi
     build_autoconf qjackctl "${QJACKCTL_VERSION}" "--enable-jack-version"
     if [ "${WIN32}" -eq 1 ]; then
         copy_file qjackctl "${QJACKCTL_VERSION}" "src/release/qjackctl.exe" "${PAWPAW_PREFIX}/jack2/bin/qjackctl.exe"
diff --git a/build-qt.sh b/build-qt.sh
index db69685..f947d08 100755
--- a/build-qt.sh
+++ b/build-qt.sh
@@ -236,6 +236,12 @@ patch_file qtbase${qtsuffix} ${QT5_VERSION} "mkspecs/win32-g++/qmake.conf" 's/=
 patch_file qtbase${qtsuffix} ${QT5_VERSION} "src/plugins/platforms/direct2d/direct2d.pro" 's/-lVersion/-lversion/'
 build_qt_conf qtbase "${qtbase_conf_args}"
 
+if [ "${MACOS}" -eq 1 ] && [ ! -e "ln -s ${PAWPAW_PREFIX}/include/qt5/QtCore" ]; then
+    ln -sfv ${PAWPAW_PREFIX}/lib/QtCore.framework/Headers ${PAWPAW_PREFIX}/include/qt5/QtCore
+    ln -sfv ${PAWPAW_PREFIX}/lib/QtGui.framework/Headers ${PAWPAW_PREFIX}/include/qt5/QtGui
+    ln -sfv ${PAWPAW_PREFIX}/lib/QtWidgets.framework/Headers ${PAWPAW_PREFIX}/include/qt5/QtWidgets
+fi
+
 # ---------------------------------------------------------------------------------------------------------------------
 
 download_qt qtsvg