diff --git a/configure.ac b/configure.ac
index 175c04d2f3..6202c22835 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1199,7 +1199,7 @@ dnl
 dnl Various functions
 dnl
 
-AC_SEARCH_LIBS(setsockopt, socket)
+AC_SEARCH_LIBS(setsockopt, [socket ws2_32])
 AC_SEARCH_LIBS(gethostent, nsl)
 
 AC_CHECK_FUNCS(socket)
diff --git a/m4/snprintf.m4 b/m4/snprintf.m4
index eb16c7f8f9..85bd421965 100644
--- a/m4/snprintf.m4
+++ b/m4/snprintf.m4
@@ -135,7 +135,9 @@ AC_DEFUN([HW_FUNC_VSNPRINTF],
             return 1;]])],
         [hw_cv_func_vsnprintf_c99=yes],
         [hw_cv_func_vsnprintf_c99=no],
-        [hw_cv_func_vsnprintf_c99=no])])],
+        [AS_CASE([$host_os],
+          [mingw*], [hw_cv_func_vsnprintf_c99=yes],
+          [hw_cv_func_vsnprintf_c99=no])])])],
     [hw_cv_func_snprintf_c99=no])
   AS_IF(
     [test "$hw_cv_func_vsnprintf_c99" = yes],
@@ -178,7 +180,9 @@ AC_DEFUN([HW_FUNC_SNPRINTF],
             return 1;]])],
         [hw_cv_func_snprintf_c99=yes],
         [hw_cv_func_snprintf_c99=no],
-        [hw_cv_func_snprintf_c99=no])])],
+        [AS_CASE([$host_os],
+          [mingw*], [hw_cv_func_snprintf_c99=yes],
+          [hw_cv_func_snprintf_c99=no])])])],
     [hw_cv_func_snprintf_c99=no])
   AS_IF(
     [test "$hw_cv_func_snprintf_c99" = yes],