diff --git a/.gitignore b/.gitignore
index e64aea5..15d51dd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,6 +11,7 @@ Makefile.in
 INSTALL
 aclocal.m4
 ar-lib
+build
 compile
 config.*
 configure
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4c921e3..35e0452 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -21,8 +21,12 @@ find_package(OpenSSL REQUIRED)
 IF(WIN32)
   configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/config_windows.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/include/config.h)
   include_directories(${CMAKE_CURRENT_SOURCE_DIR}/contrib/win32)
-  find_library(WINSOCK_LIB libws2_32.a)
-  set(LIBS ${LIBS} ${WINSOCK_LIB})
+  IF(NOT MINGW)
+    find_library(WINSOCK_LIB libws2_32.a)
+    set(LIBS ${LIBS} ${WINSOCK_LIB})
+  ELSE(NOT MINGW)
+    set(LIBS ${LIBS} libws2_32.a)
+  ENDIF(NOT MINGW)
 ELSE(WIN32)
   include(CheckIncludeFiles)
   check_include_files("sys/endian.h" HAVE_SYS_ENDIAN_H)
@@ -36,14 +40,6 @@ ENDIF(WIN32)
 include_directories(${CMAKE_CURRENT_BINARY_DIR}/include/)
 add_definitions("-DHAVE_CONFIG_H")
 
-if(MINGW AND CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows")
-  # force MinGW-w64 in 32bit mode
-  add_definitions("-m32")
-  add_definitions("-DNOCRYPT")
-  set(CMAKE_SHARED_LINKER_FLAGS -m32)
-  set(CMAKE_EXE_LINKER_FLAGS -m32)
-endif(MINGW)
-
 message("CMAKE_C_FLAGS: " ${CMAKE_C_FLAGS})
 message("CMAKE_SHARED_LINKER_FLAGS: " ${CMAKE_SHARED_LINKER_FLAGS})