diff --git a/.github/workflows/windows-ci.yml b/.github/workflows/windows-ci.yml
index 6da762317c..728070e0ce 100644
--- a/.github/workflows/windows-ci.yml
+++ b/.github/workflows/windows-ci.yml
@@ -59,7 +59,6 @@ jobs:
             mingw-w64-${{ env.msys_cpu }}-bzip2
             mingw-w64-${{ env.msys_cpu }}-cairo
             mingw-w64-${{ env.msys_cpu }}-curl
-            mingw-w64-${{ env.msys_cpu }}-freeimage
             mingw-w64-${{ env.msys_cpu }}-libgd
             mingw-w64-${{ env.msys_cpu }}-ghostscript
             mingw-w64-${{ env.msys_cpu }}-openssl
@@ -72,6 +71,7 @@ jobs:
           pacman -S --noconfirm mingw-w64-${{ env.msys_cpu }}-postgresql
           pacman -S --noconfirm mingw-w64-${{ env.msys_cpu }}-libmariadbclient
           pacman -S --noconfirm mingw-w64-${{ env.msys_cpu }}-firebird
+          pacman -S --noconfirm mingw-w64-${{ env.msys_cpu }}-freeimage
 
       - name: Checkout code
         uses: actions/checkout@v3
diff --git a/ChangeLog.txt b/ChangeLog.txt
index 674b9fb4ef..cf6b12823c 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -7,6 +7,15 @@
    Entries may not always be in chronological/commit order.
    See license at the end of file. */
 
+2025-01-21 09:45 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
+  * .github/workflows/windows-ci.yml
+    * install freeimage only in 64-bit environment,
+      it's not available in the 32-bit one
+
+  * contrib/3rd/sqlite3/sqlite3.hbp
+    * use -Wno-unknown-warning-option to pacify problems with old
+      clang versions which do not understand -Wno-stringop-overread
+
 2025-01-21 09:08 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
   * .github/workflows/linux-ci.yml
     * disabled global -Wno-error=... C compiler parameters
diff --git a/contrib/3rd/sqlite3/sqlite3.hbp b/contrib/3rd/sqlite3/sqlite3.hbp
index 116ab695f5..9cbed0a42f 100644
--- a/contrib/3rd/sqlite3/sqlite3.hbp
+++ b/contrib/3rd/sqlite3/sqlite3.hbp
@@ -43,7 +43,8 @@
 -c=gnu90{allgcc&HB_COMP_VER='45'}
 
 # GCC 14 reports strlen reading 1 or more bytes from a region of size 0 warning
--cflag=-Wno-error=stringop-overread{allgcc&HB_BUILD_TEST='strict'&!(win&clang)}
+-cflag=-Wno-error=stringop-overread{allgcc&HB_BUILD_TEST='strict'}
+-cflag=-Wno-unknown-warning-option{allgcc&HB_BUILD_TEST='strict'}
 
 sqlite3.c