diff --git a/config/cmake_ext_mod/HDFMacros.cmake b/config/cmake_ext_mod/HDFMacros.cmake
index 52b96fc03e..0a4598d43d 100644
--- a/config/cmake_ext_mod/HDFMacros.cmake
+++ b/config/cmake_ext_mod/HDFMacros.cmake
@@ -73,7 +73,7 @@ endmacro ()
 
 #-------------------------------------------------------------------------------
 macro (INSTALL_TARGET_PDB libtarget targetdestination targetcomponent)
-  if (WIN32 AND MSVC)
+  if (WIN32 AND MSVC AND NOT DISABLE_PDB_FILES)
     get_target_property (target_type ${libtarget} TYPE)
     if (${libtype} MATCHES "SHARED")
       set (targetfilename $<TARGET_PDB_FILE:${libtarget}>)
diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt
index 01d8658176..6be1d7fa03 100644
--- a/release_docs/RELEASE.txt
+++ b/release_docs/RELEASE.txt
@@ -48,6 +48,15 @@ New Features
 
     Configuration:
     -------------
+    - Windows PDB files are always installed
+
+      There are configuration settings for Windows, that may not generate
+      PDB files. As such the install utility will break because those files
+      are not found. Add an optional variable that can be set to not install
+      PDB files.
+
+      (ADB - 2019/07/17, HDFFV-100424)
+
     - Windows PDB files are installed incorrectly
 
       For static builds, the PDB files for windows should be installed next