diff --git a/ChangeLog b/ChangeLog
index 01111f40d..da61c3586 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2015-08-24  Richard Frith-Macdonald <rfm@gnu.org>
+
+	* Source/win32/GSFileHandle.m: include winsock2.h earlier for msys2
+
 2015-08-17  Fred Kiefer <fredkiefer@gmx.de>
 
 	* Resources/Korean.lproj/Localizable.string: Correct encoding
diff --git a/Source/win32/GSFileHandle.m b/Source/win32/GSFileHandle.m
index b13808b5a..153474e45 100644
--- a/Source/win32/GSFileHandle.m
+++ b/Source/win32/GSFileHandle.m
@@ -22,6 +22,8 @@
    Boston, MA 02111 USA.
    */
 
+#include <winsock2.h>
+
 #include "common.h"
 
 #import "Foundation/NSObject.h"
@@ -43,7 +45,6 @@
 #import "../GSPrivate.h"
 #import "../GSNetwork.h"
 
-#include <winsock2.h>
 #include <fcntl.h>
 #include <sys/file.h>
 #include <sys/types.h>