diff --git a/Headers/GNUstepBase/GSConfig.h.in b/Headers/GNUstepBase/GSConfig.h.in
index 8d23b6f5d..9ee38c4af 100644
--- a/Headers/GNUstepBase/GSConfig.h.in
+++ b/Headers/GNUstepBase/GSConfig.h.in
@@ -306,8 +306,18 @@ typedef	struct {
 #define WINVER Windows2000
 #endif
 
+// Trick to distinguish between MSYS/MinGW and MSYS2/MinGW32, the latter defines
+// __MINGW32_MAJOR_VERSION and __MINGW32_MINOR_VERSION for compatibility
+// but to a lower version than older MSYS/MinGW, but not the compound version
+//
+#if defined(__MINGW32_VERSION)
+#define __USE_W32_SOCKETS
+#include <windows.h>
+#include <winsock2.h>
+#else
 #include <winsock2.h>
 #include <windows.h>
+#endif
 
 #undef __OBJC_BOOL
 #undef  BOOL