diff --git a/CHANGELOG.md b/CHANGELOG.md
index 849cb5ec..ac15d75b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,8 @@
 1.0.0-b14
 
 * Add missing rebind to handler_alloc
+* Fix error handling in http server examples
+* Fix CMake scripts for MinGW
 
 --------------------------------------------------------------------------------
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 20530bbb..0a237cfa 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,7 +6,7 @@ project (Beast)
 
 set_property (GLOBAL PROPERTY USE_FOLDERS ON)
 
-if (WIN32)
+if (MSVC)
     set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP /W4 /wd4100 /bigobj /D _WIN32_WINNT=0x0601 /D_SCL_SECURE_NO_WARNINGS=1 /D_CRT_SECURE_NO_WARNINGS=1")
     set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /SAFESEH:NO")
 else()
@@ -23,6 +23,10 @@ else()
       "${CMAKE_CXX_FLAGS} -std=c++11 -Wall -Wpedantic")
 endif()
 
+if (MINGW)
+    link_libraries(${Boost_LIBRARIES} ws2_32 mswsock)
+endif()
+
 if ("${VARIANT}" STREQUAL "coverage")
     set(CMAKE_CXX_FLAGS
       "${CMAKE_CXX_FLAGS} -fprofile-arcs -ftest-coverage")
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index c2e53863..c9fe1f66 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -17,3 +17,7 @@ add_executable (lib-tests
 if (NOT WIN32)
     target_link_libraries(lib-tests ${Boost_LIBRARIES})
 endif()
+
+if (MINGW)
+    set_target_properties(lib-tests PROPERTIES COMPILE_FLAGS "-Wa,-mbig-obj")
+endif()
diff --git a/test/websocket/CMakeLists.txt b/test/websocket/CMakeLists.txt
index 5cc4c20b..51741891 100644
--- a/test/websocket/CMakeLists.txt
+++ b/test/websocket/CMakeLists.txt
@@ -25,6 +25,10 @@ if (NOT WIN32)
     target_link_libraries(websocket-tests ${Boost_LIBRARIES} Threads::Threads)
 endif()
 
+if (MINGW)
+    set_target_properties(websocket-tests PROPERTIES COMPILE_FLAGS "-Wa,-mbig-obj -Og")
+endif()
+
 add_executable (websocket-echo
     ${BEAST_INCLUDES}
     ${EXTRAS_INCLUDES}