diff -uNr a/cmake/install_macros.cmake b/cmake/install_macros.cmake
--- a/cmake/install_macros.cmake	2015-07-03 15:00:34.000000000 +0300
+++ b/cmake/install_macros.cmake	2015-07-05 10:40:15.128320000 +0300
@@ -34,9 +34,19 @@
   FOREACH(target ${targets})
     GET_TARGET_PROPERTY(type ${target} TYPE)
     GET_TARGET_PROPERTY(location ${target} LOCATION)
+	
+	GET_TARGET_PROPERTY(__POSTFIX ${target} DEBUG_POSTFIX)
+	
     STRING(REPLACE ".exe" ".pdb" pdb_location ${location})
-    STRING(REPLACE ".dll" ".pdb" pdb_location ${pdb_location})
-    STRING(REPLACE ".lib" ".pdb" pdb_location ${pdb_location})
+	
+	IF(__POSTFIX)
+		STRING(REPLACE ".dll" "${__POSTFIX}.pdb" pdb_location ${pdb_location})
+		STRING(REPLACE ".lib" "${__POSTFIX}.pdb" pdb_location ${pdb_location})
+	ELSE()
+		STRING(REPLACE ".dll" ".pdb" pdb_location ${pdb_location})
+		STRING(REPLACE ".lib" ".pdb" pdb_location ${pdb_location})		
+	ENDIF()
+	
     IF(CMAKE_GENERATOR MATCHES "Visual Studio")
       STRING(REPLACE
         "${CMAKE_CFG_INTDIR}" "\${CMAKE_INSTALL_CONFIG_NAME}"
diff -uNr a/cmake/libutils.cmake b/cmake/libutils.cmake
--- a/cmake/libutils.cmake	2015-07-03 15:00:34.000000000 +0300
+++ b/cmake/libutils.cmake	2015-07-05 10:40:15.128320000 +0300
@@ -101,6 +101,9 @@
   SET(SOURCES ${ARGN})
   LIST(REMOVE_AT SOURCES 0)
   ADD_LIBRARY(${TARGET} STATIC ${SOURCES})
+  IF(CMAKE_DEBUG_POSTFIX)
+	SET_TARGET_PROPERTIES(${TARGET} PROPERTIES DEBUG_POSTFIX ${CMAKE_DEBUG_POSTFIX})
+  ENDIF()
   IF(NOT _SKIP_PIC)
     SET_TARGET_PROPERTIES(${TARGET} PROPERTIES  COMPILE_FLAGS
     "${CMAKE_SHARED_LIBRARY_C_FLAGS}")
@@ -136,6 +139,8 @@
   FOREACH(LIB ${LIBS_TO_MERGE})
     GET_TARGET_PROPERTY(LIB_LOCATION ${LIB} LOCATION)
     GET_TARGET_PROPERTY(LIB_TYPE ${LIB} TYPE)
+	GET_TARGET_PROPERTY(LIB_OUTNAME ${LIB} OUTPUT_NAME)
+	STRING(REPLACE ".lib" "${CMAKE_DEBUG_POSTFIX}.lib" LIB_LOCATION ${LIB_LOCATION})
     IF(NOT LIB_LOCATION)
        # 3rd party library like libz.so. Make sure that everything
        # that links to our library links to this one as well.
diff -uNr a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt	2015-07-03 15:00:34.000000000 +0300
+++ b/CMakeLists.txt	2015-07-05 10:40:15.128320000 +0300
@@ -421,7 +421,7 @@
 INCLUDE(cmake/tags.cmake)
 
 IF(WIN32)
-  ADD_SUBDIRECTORY(win/upgrade_wizard)
+  #ADD_SUBDIRECTORY(win/upgrade_wizard)
   ADD_SUBDIRECTORY(win/packaging)
 ENDIF()
 ADD_SUBDIRECTORY(packaging/solaris)