diff --git a/Microsoft.WindowsAzure.Storage/CMakeLists.txt b/Microsoft.WindowsAzure.Storage/CMakeLists.txt
index a9c5a166..d36c76ea 100644
--- a/Microsoft.WindowsAzure.Storage/CMakeLists.txt
+++ b/Microsoft.WindowsAzure.Storage/CMakeLists.txt
@@ -113,6 +113,10 @@ elseif(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
   message("-- Setting MSVC options")
   add_compile_options(/bigobj)
   add_compile_options(/MP)
+  add_compile_options(/Zi)
+  add_compile_options(/GF)
+  add_compile_options(/Gy)
+  set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} /DEBUG /DEBUGTYPE:cv,fixup /INCREMENTAL:NO")
   if(BUILD_SHARED_LIBS)
     add_definitions(-DWASTORAGE_DLL -D_USRDLL)
   else()