diff --git a/configure.ac b/configure.ac
index 3a0ef16..5f70a7c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -41,7 +41,8 @@ case $host_os in
 		;;
 	*mingw*)
 		HOST_OS=win
-		CFLAGS="$CFLAGS -D_GNU_SOURCE -D_POSIX -D_POSIX_SOURCE -D_REENTRANT -D_POSIX_THREAD_SAFE_FUNCTIONS -DWIN32_LEAN_AND_MEAN -D_WIN32_WINNT=0x0600 -DOPENSSL_NO_SPEED -DNO_SYSLOG -D__USE_MINGW_ANSI_STDIO"
+		CFLAGS="$CFLAGS -D_GNU_SOURCE -D_POSIX -D_POSIX_SOURCE -D_REENTRANT -D_POSIX_THREAD_SAFE_FUNCTIONS -DWIN32_LEAN_AND_MEAN -D_WIN32_WINNT=0x0600 -DOPENSSL_NO_SPEED -DNO_SYSLOG -D__USE_MINGW_ANSI_STDIO -static-libgcc"
+		LDFLAGS="$LDFLAGS -static-libgcc"
 		AC_SUBST([PLATFORM_LDADD], ['-lws2_32'])
 		;;
 	*solaris*)
diff --git a/dist-win.sh b/dist-win.sh
index d600b97..42569ac 100755
--- a/dist-win.sh
+++ b/dist-win.sh
@@ -8,6 +8,7 @@ DIST=libressl-$VERSION-windows
 
 rm -fr $DIST
 mkdir -p $DIST
+autoreconf -i
 
 for ARCH in X86 X64; do