diff --git a/ChangeLog b/ChangeLog
index 32a7988ef..1a5c62bac 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,6 +13,7 @@
 	* Source/NSFileManager.m (-findNextFile): Check if lstat,
 	geteuid implemented.
 	* Source/NSHost.m: Change includes for MINGW.
+	* Source/NSPortNameServer.m: Likewise.
 	* Source/NSPipe.m (init): Port to MINGW.
 
 	* configure.in: Do preface.h substitutions here.
diff --git a/Source/GSTcpPort.m b/Source/GSTcpPort.m
index 52b6b2640..7ba56adf0 100644
--- a/Source/GSTcpPort.m
+++ b/Source/GSTcpPort.m
@@ -375,7 +375,7 @@ static Class	runLoopClass;
     }
 #ifdef __MINGW__
   dummy = 1;
-  if (ioctlsocket(udp_desc, FIONBIO, &dummy) < 0)
+  if (ioctlsocket(d, FIONBIO, &dummy) < 0)
     {
       NSLog(@"unable to set non-blocking mode - %s", strerror(errno));
       return nil;
diff --git a/Source/NSPortNameServer.m b/Source/NSPortNameServer.m
index da392e94b..bce7ba29e 100644
--- a/Source/NSPortNameServer.m
+++ b/Source/NSPortNameServer.m
@@ -39,8 +39,13 @@
 #include <Foundation/NSTimer.h>
 #include <Foundation/NSPortNameServer.h>
 #include <Foundation/NSDebug.h>
+#ifdef __MINGW__
+#include <winsock.h>
+#include <wininet.h>
+#else
 #include <netinet/in.h>
 #include <arpa/inet.h>
+#endif
 
 /*
  *	Protocol definition stuff for talking to gdomap process.