diff --git a/ChangeLog b/ChangeLog
index 54d7db623..1ff7caf2b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -20,6 +20,9 @@ Bugfix
      (found by robotanarchy) (#232).
    * Fix bug in Makefile that prevented from installing without building the
      tests (found by robotanarchy) (#232).
+   * Fix missing -static-libgcc when building shared libraries for Windows
+     with make.
+   * Fix link error when building shared libraries for Windows with make.
 
 Changes
    * The PEM parser now accepts a trailing space at end of lines (#226).
diff --git a/tests/scripts/all.sh b/tests/scripts/all.sh
index 8b171ba27..863ff3a4e 100755
--- a/tests/scripts/all.sh
+++ b/tests/scripts/all.sh
@@ -241,6 +241,8 @@ msg "build: cross-mingw64, make" # ~ 30s
 cleanup
 CC=i686-w64-mingw32-gcc AR=i686-w64-mingw32-ar LD=i686-w64-minggw32-ld CFLAGS=-Werror WINDOWS_BUILD=1 make
 WINDOWS_BUILD=1 make clean
+CC=i686-w64-mingw32-gcc AR=i686-w64-mingw32-ar LD=i686-w64-minggw32-ld CFLAGS=-Werror WINDOWS_BUILD=1 SHARED=1 make
+WINDOWS_BUILD=1 make clean
 fi
 
 # MemSan currently only available on Linux 64 bits