diff --git a/ChangeLog b/ChangeLog
index af83146..e2be1a1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,15 @@
 Version 1.6.18
 *******************************************************************************
 
+2012-03-26 Yoichi NAKAYAMA <yoichi.nakayama(at)gmail.com>
+
+	Fix type of local variable stopSock in RunMiniServer()
+
+	The variable is declared as SOCKET, but it is used to
+	store return value of int receive_from_stopSock(...).
+	The type was changed in the commit
+	4b47e6a51d9c7049a862695b68de75699e023551 by mistake.
+
 2012-04-03 Fabrice Fontaine <fabrice.fontaine(at)orange.com>
 
 	Compilation optimisation
diff --git a/upnp/src/genlib/miniserver/miniserver.c b/upnp/src/genlib/miniserver/miniserver.c
index e57a907..af310ca 100644
--- a/upnp/src/genlib/miniserver/miniserver.c
+++ b/upnp/src/genlib/miniserver/miniserver.c
@@ -377,7 +377,7 @@ static void RunMiniServer(
 	fd_set rdSet;
 	SOCKET maxMiniSock;
 	int ret = 0;
-	SOCKET stopSock = 0;
+	int stopSock = 0;
 
 	maxMiniSock = 0;
 	maxMiniSock = max(maxMiniSock, miniSock->miniServerSock4);