diff --git a/configure.ac b/configure.ac
index 16f2bf429572cb9faaba7cfa01cc5a3371f8d2ff..d4ede1d0cb9c8a6e1f16dfe6948602af89908797 100644
--- a/configure.ac
+++ b/configure.ac
@@ -78,7 +78,8 @@ case "${host_os}" in
     AC_DEFINE([WIN32_LEAN_AND_MEAN],[1], [Define to limit the scope of <windows.h>.])
 
     CPPFLAGS+="-D_WIN32_WINNT=0x0601 -DWINVER=0x0601 -D__USE_MINGW_ANSI_STDIO=1"
-    LDFLAGS+="-no-undefined -avoid-version -Wl,--nxcompat -Wl,--dynamicbase"
+    LDFLAGS+="-Wl,--nxcompat -Wl,--dynamicbase"
+    LIBS+=" -lws2_32"
     ac_default_prefix="`pwd`/_win32"
     DESTDIR="`pwd`/_win32/"
     AC_SUBST(WINDOWS_ARCH)
diff --git a/src/Makefile.am b/src/Makefile.am
index 6db024c779d56c628070764ac0137661b3b5f36a..c9e4bf7773158eff29bef9010d0083d34c538c42 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -57,6 +57,10 @@ libring_la_LDFLAGS = \
 		@ZLIB_LIBS@ \
 		$(PCRE_LIBS)
 
+if HAVE_WIN32
+libring_la_LDFLAGS += -no-undefined -avoid-version
+endif
+
 if HAVE_OSX
 #FIXME necessary for -lintl
 libring_la_LDFLAGS += -L/usr/local/opt/gettext/lib