diff --git a/CHANGES b/CHANGES
index 64c567150b..488e3bad7e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+3187.	[port]		win32: support for Visual Studio 2008.	[RT #26356]
+
 	--- 9.9.0b1 released ---
 
 3186.	[bug]		Version/db mis-match in rpz code. [RT #26180]
diff --git a/bin/win32/BINDInstall/StdAfx.h b/bin/win32/BINDInstall/StdAfx.h
index d5929bbadc..9ed780d862 100644
--- a/bin/win32/BINDInstall/StdAfx.h
+++ b/bin/win32/BINDInstall/StdAfx.h
@@ -3,6 +3,11 @@
 //      are changed infrequently
 //
 
+/*
+ * Minimum version is Windows XP
+ */
+#define _WIN32_WINNT 0x0501
+
 #ifndef _CRT_SECURE_NO_DEPRECATE
 #define _CRT_SECURE_NO_DEPRECATE 1
 #endif
diff --git a/config.h.win32 b/config.h.win32
index 0cbab551b4..fc961fa6c0 100644
--- a/config.h.win32
+++ b/config.h.win32
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: config.h.win32,v 1.27 2011/03/10 04:36:13 each Exp $ */
+/* $Id: config.h.win32,v 1.28 2011/10/30 23:39:39 marka Exp $ */
 
 /*
  * win32 configuration file
@@ -49,11 +49,9 @@
 #define _USE_32BIT_TIME_T 1
 
 /*
- * Windows NT and 2K only
+ * Minimum version is Windows XP
  */
-#ifndef _WIN32_WINNT
-#define _WIN32_WINNT 0x0400
-#endif
+#define _WIN32_WINNT 0x0501
 
 /* Define if you have the ANSI C header files.  */
 #define STDC_HEADERS 1
@@ -170,7 +168,9 @@
  */
 
 #define snprintf _snprintf
+#if _MSC_VER <= 1400
 #define vsnprintf _vsnprintf
+#endif
 #define strcasecmp  _stricmp
 #define strncasecmp _strnicmp
 #define strdup _strdup
diff --git a/lib/isc/win32/net.c b/lib/isc/win32/net.c
index b88349d1c9..d4d5934abb 100644
--- a/lib/isc/win32/net.c
+++ b/lib/isc/win32/net.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: net.c,v 1.20 2009/09/08 23:41:50 tbox Exp $ */
+/* $Id: net.c,v 1.21 2011/10/30 23:39:39 marka Exp $ */
 
 #include <config.h>
 
@@ -166,7 +166,8 @@ try_ipv6only(void) {
 	}
 
 	on = 1;
-	if (setsockopt(s, IPPROTO_IPV6, IPV6_V6ONLY, &on, sizeof(on)) < 0) {
+	if (setsockopt(s, IPPROTO_IPV6, IPV6_V6ONLY, (const char *)&on,
+		       sizeof(on)) < 0) {
 		ipv6only_result = ISC_R_NOTFOUND;
 		goto close;
 	}
@@ -189,7 +190,8 @@ try_ipv6only(void) {
 	}
 
 	on = 1;
-	if (setsockopt(s, IPPROTO_IPV6, IPV6_V6ONLY, &on, sizeof(on)) < 0) {
+	if (setsockopt(s, IPPROTO_IPV6, IPV6_V6ONLY, (const char *)&on,
+		       sizeof(on)) < 0) {
 		ipv6only_result = ISC_R_NOTFOUND;
 		goto close;
 	}