diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0f0940ff7..4d0766d32 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -100,14 +100,14 @@ else ()
   endif ()
 endif ()
 
-if (WIN32 AND BUILD_SHARED_LIBS)
-  message(FATAL_ERROR "Shared libraries not supported on Windows.")
-endif ()
-
 
 project(freetype)
 
 
+if (WIN32 AND NOT MINGW AND BUILD_SHARED_LIBS)
+  message(FATAL_ERROR "Building shared libraries on Windows needs MinGW")
+endif ()
+
 # Disallow in-source builds
 if ("${PROJECT_BINARY_DIR}" STREQUAL "${PROJECT_SOURCE_DIR}")
   message(FATAL_ERROR
diff --git a/ChangeLog b/ChangeLog
index 3ea8ecd46..97e8b08c7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2015-10-20  StudioEtrange  <nomorgan@gmail.com>
+
+	* CMakeLists.txt: Enable shared library builds on MinGW (#46233).
+
 2015-10-20  Werner Lemberg  <wl@gnu.org>
 
 	* src/type1/t1afm.c (T1_Read_Metrics): Fix memory leak (#46229).