diff --git a/ChangeLog b/ChangeLog
index 26a7716..3e61148 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2006-12-23 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
+
+	* David Maass's patch for VStudio2005 compilation failure.
+
 2006-12-23 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
 
 	* Erik Johansson's patch for invalid xml output.
diff --git a/THANKS b/THANKS
index 4779d13..b157ccb 100644
--- a/THANKS
+++ b/THANKS
@@ -8,6 +8,7 @@ exempt of errors.
 
 - Arno Willig
 - Chaos
+- David Maass
 - Erik Johansson
 - Eric Tanguy
 - Erwan Velu
diff --git a/upnp/src/genlib/miniserver/miniserver.c b/upnp/src/genlib/miniserver/miniserver.c
index b6368da..fbc0d6e 100644
--- a/upnp/src/genlib/miniserver/miniserver.c
+++ b/upnp/src/genlib/miniserver/miniserver.c
@@ -45,7 +45,7 @@
 #else
  #include <winsock2.h>
 
- #define socklen_t int
+ typedef int socklen_t;
  #define EAFNOSUPPORT 97
 #endif
 #include "unixutil.h"
diff --git a/upnp/src/inc/inet_pton.h b/upnp/src/inc/inet_pton.h
index df59b6d..ba91c34 100644
--- a/upnp/src/inc/inet_pton.h
+++ b/upnp/src/inc/inet_pton.h
@@ -7,7 +7,7 @@
 #include <errno.h>
 #include <stdio.h>
 #include <string.h>
-#define socklen_t int
+typedef int socklen_t;
 #define EAFNOSUPPORT 97
 
 /*
diff --git a/upnp/src/inc/unixutil.h b/upnp/src/inc/unixutil.h
index 08e41bd..0f9624f 100644
--- a/upnp/src/inc/unixutil.h
+++ b/upnp/src/inc/unixutil.h
@@ -40,7 +40,7 @@
 #else
  #define XINLINE
 
- #define socklen_t int
+ typedef int socklen_t;
  #define EAFNOSUPPORT 97
 #endif
 
diff --git a/upnp/src/inet_pton.c b/upnp/src/inet_pton.c
index d43382e..489391c 100644
--- a/upnp/src/inet_pton.c
+++ b/upnp/src/inet_pton.c
@@ -28,7 +28,7 @@
 #include <errno.h>
 #include <stdio.h>
 #include <string.h>
-#define socklen_t int
+typedef int socklen_t;
 #define EAFNOSUPPORT 97
 /*
  * WARNING: Don't even consider trying to compile this on a system where