diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4d0766d32..1a96ef6f9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -330,12 +330,6 @@ if (BUILD_FRAMEWORK)
 endif ()
 
 
-if (MSVC)
-  set_target_properties(freetype PROPERTIES
-    COMPILE_FLAGS /Fd"$(IntDir)$(TargetName).pdb")
-endif ()
-
-
 if (ZLIB_FOUND)
   target_link_libraries(freetype ${ZLIB_LIBRARIES})
   include_directories(${ZLIB_INCLUDE_DIRS})
diff --git a/ChangeLog b/ChangeLog
index 8c618ccba..dd0d09188 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2015-10-29  Werner Lemberg  <wl@gnu.org>
+
+	* CMakeLists.txt: Remove code to set MSVC's /FD compiler switch.
+
+	Problem reported by David Capello <davidcapello@gmail.com>; see
+
+	  http://lists.nongnu.org/archive/html/freetype-devel/2015-10/msg00108.html
+
+	for details.
+
 2015-10-27  Werner Lemberg  <wl@gnu.org>
 
 	[pfr] Add some safety guards (#46302).