diff --git a/CMakeLists.txt b/CMakeLists.txt
index 82208dc12..26f00c728 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -53,7 +53,10 @@ IF (MSVC)
 	SET(CMAKE_C_FLAGS_DEBUG "/Od /DEBUG /MTd")
 	SET(CMAKE_C_FLAGS_RELEASE "/MT /O2")
 ELSE ()
-	SET(CMAKE_C_FLAGS "-Wall -Wextra -fPIC")
+	SET(CMAKE_C_FLAGS "-Wall -Wextra")
+	IF (NOT MINGW) # MinGW always does PIC and complains if we tell it to
+		SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC")
+	ENDIF ()
 	SET(CMAKE_C_FLAGS_DEBUG "-g -O0")
 	SET(CMAKE_C_FLAGS_RELEASE "-O2")
 ENDIF()
@@ -86,6 +89,11 @@ ENDIF ()
 
 # Compile and link libgit2
 ADD_LIBRARY(git2 ${SRC} ${SRC_ZLIB})
+
+IF (WIN32)
+	TARGET_LINK_LIBRARIES(git2 ws2_32)
+ENDIF ()
+
 TARGET_LINK_LIBRARIES(git2 ${CMAKE_THREAD_LIBS_INIT})
 SET_TARGET_PROPERTIES(git2 PROPERTIES VERSION ${LIBGIT2_VERSION_STRING})
 SET_TARGET_PROPERTIES(git2 PROPERTIES SOVERSION ${LIBGIT2_VERSION_MAJOR})
diff --git a/src/netops.c b/src/netops.c
index 613226d46..55cb7e45e 100644
--- a/src/netops.c
+++ b/src/netops.c
@@ -23,11 +23,12 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#ifndef _MSC_VER
+#ifndef _WIN32
 # include <sys/types.h>
 # include <sys/socket.h>
 # include <netdb.h>
 #else
+# define _WIN32_WINNT 0x0501
 # include <winsock2.h>
 # include <Ws2tcpip.h>
 # pragma comment(lib, "Ws2_32.lib")
diff --git a/src/transport_git.c b/src/transport_git.c
index d79ab5e34..b3e940731 100644
--- a/src/transport_git.c
+++ b/src/transport_git.c
@@ -23,16 +23,6 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#ifndef _MSC_VER
-# include <sys/types.h>
-# include <sys/socket.h>
-# include <netdb.h>
-#else
-# include <winsock2.h>
-# include <Ws2tcpip.h>
-# pragma comment(lib, "Ws2_32.lib")
-#endif
-
 #include "git2/net.h"
 #include "git2/pkt.h"
 #include "git2/common.h"