diff --git a/bootstrap-carla.sh b/bootstrap-carla.sh
index 4d27abf..5302525 100755
--- a/bootstrap-carla.sh
+++ b/bootstrap-carla.sh
@@ -119,6 +119,10 @@ function build_pyqt() {
     export LDFLAGS="$(echo ${LDFLAGS} | sed -e 's/-Wl,-dead_strip -Wl,-dead_strip_dylibs//')"
     export LDFLAGS="$(echo ${LDFLAGS} | sed -e 's/-fdata-sections -ffunction-sections//')"
 
+    if [ "${WIN32}" -eq 1 ]; then
+        export CXXFLAGS+=" -Wno-deprecated-copy"
+    fi
+
     if [ ! -f "${pkgdir}/.stamp_configured" ]; then
         pushd "${pkgdir}"
 
@@ -163,10 +167,10 @@ function build_pyqt() {
 
         # fix win32 linkage
         if [ "${WIN32}" -eq 1 ]; then
-            sed -i -e 's|config -lpython|config-3.8 -Wl,-Bdynamic -lpython|' */Makefile
+            sed -i -e 's|config -lpython3.8|config-3.8 -Wl,-Bdynamic -lpython3.8 -Wl,-Bstatic|' */Makefile
             if [ -f "QtCore/Makefile.Release" ]; then
                 for mak in $(find -maxdepth 2 -type f -name Makefile.Release); do
-                    echo "LIBS += -L${PAWPAW_PREFIX}/lib/python3.8/config-3.8 -Wl,-Bdynamic -lpython3.8" >> ${mak}
+                    echo "LIBS += -L${PAWPAW_PREFIX}/lib/python3.8/config-3.8 -Wl,-Bdynamic -lpython3.8 -Wl,-Bstatic" >> ${mak}
                 done
             fi
         fi
diff --git a/setup/env.sh b/setup/env.sh
index 65aabc7..01f6faa 100644
--- a/setup/env.sh
+++ b/setup/env.sh
@@ -92,7 +92,7 @@ if [ "${MACOS}" -eq 1 ]; then
 else
     LINK_FLAGS+=" -Wl,-O1 -Wl,--as-needed -Wl,--gc-sections -Wl,--no-undefined -Wl,--strip-all"
     if [ "${WIN32}" -eq 1 ]; then
-        LINK_FLAGS+=" -static -Wl,-Bstatic"
+        LINK_FLAGS+=" -static -static-libgcc -static-libstdc++ -Wl,-Bstatic"
         if [ "${CROSS_COMPILING}" -eq 0 ] && [ -e "/usr/lib/libssp.a" ]; then
             LINK_FLAGS+=" -lssp"
         else