diff --git a/acx_nlnetlabs.m4 b/acx_nlnetlabs.m4
index 4739a5de7..06f23810c 100644
--- a/acx_nlnetlabs.m4
+++ b/acx_nlnetlabs.m4
@@ -2,7 +2,8 @@
 # Copyright 2009, Wouter Wijngaards, NLnet Labs.   
 # BSD licensed.
 #
-# Version 16
+# Version 17
+# 2011-12-05 Fix getaddrinfowithincludes on windows with fedora16 mingw32-gcc.
 # 2011-11-10 Fix FLTO test to not drop a.out in current directory.
 # 2011-11-01 Fix FLTO test for llvm on Lion.
 # 2011-08-01 Fix nonblock test (broken at v13).
@@ -794,7 +795,13 @@ int main() {
 }
 ]])],
 dnl this case on linux, solaris, bsd
-[ac_cv_func_getaddrinfo="yes"],
+[ac_cv_func_getaddrinfo="yes"
+dnl see if on windows
+if test "$ac_cv_header_windows_h" = "yes"; then
+	AC_DEFINE(USE_WINSOCK, 1, [Whether the windows socket API is used])
+	USE_WINSOCK="1"
+fi
+],
 dnl no quick getaddrinfo, try mingw32 and winsock2 library.
 ORIGLIBS="$LIBS"
 LIBS="$LIBS -lws2_32"
diff --git a/configure b/configure
index 0c84b8bbf..1b47f73d3 100755
--- a/configure
+++ b/configure
@@ -16990,6 +16990,13 @@ int main() {
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_func_getaddrinfo="yes"
+if test "$ac_cv_header_windows_h" = "yes"; then
+
+$as_echo "#define USE_WINSOCK 1" >>confdefs.h
+
+	USE_WINSOCK="1"
+fi
+
 else
   ORIGLIBS="$LIBS"
 LIBS="$LIBS -lws2_32"
diff --git a/doc/Changelog b/doc/Changelog
index fcf23355a..186ce3326 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,6 @@
+5 December 2011: Wouter
+	- Fix getaddrinfowithincludes on windows with fedora16 mingw32-gcc.
+
 2 December 2011: Wouter
 	- configure generated with autoconf 2.68.