diff --git a/windows/ChangeLog b/windows/ChangeLog
index fd8d8157..7cadaa56 100644
--- a/windows/ChangeLog
+++ b/windows/ChangeLog
@@ -1,3 +1,9 @@
+2009-09-03  Gisle Vanem  <giva@bgnett.no>
+
+	* config.h (HAVE_STRING_H): Define for all Windows build
+	platforms.
+	(socklen_t): Define conditionally.
+
 2008-09-09  Gisle Vanem  <gvanem@broadpark.no>
 
 	* config-compiler.h: MingW do have <stdint.h>; added HAVE_STDINT_H.
diff --git a/windows/config.h b/windows/config.h
index 20aa7724..b70ee88d 100644
--- a/windows/config.h
+++ b/windows/config.h
@@ -91,6 +91,9 @@
 /* Define to 1 if you have the <stdint.h> header file. */
 /* #undef HAVE_STDINT_H */
 
+/* Define to 1 if you have the <string.h> header file. */
+#define HAVE_STRING_H */
+
 /* Define to 1 if you have the `strcasecmp' function. */
 /* #undef HAVE_STRCASECMP */
 
@@ -204,8 +207,10 @@
 /* Define to `unsigned' if <sys/types.h> does not define. */
 /* #undef size_t */
 
+#if !defined(_MSC_VER) || (defined(_MSC_VER) && (_MSC_VER < 1500))
 /* Define to int or size_t on systems without socklen_t. */
 #define socklen_t int
+#endif
 
 /* Define to empty if the keyword `volatile' does not work. Warning: valid
    code using `volatile' can become incorrect without. Disable with care. */