diff --git a/CMakeLists.txt b/CMakeLists.txt
index f6a29bb78..722533bfd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1166,19 +1166,19 @@ if(BUILD_PACKAGE)
             )
 
         if(CMAKE_INSTALL_DEBUG_LIBRARIES)
-            foreach(m cxcore cv cvaux ml highgui opencv_ffmpeg)
-                install(FILES ${CMAKE_BINARY_DIR}/bin/Debug/${m}${OPENCV_DLLVERSION}d.dll
+            foreach(m calib3d core contrib features2d ffmpeg flann gpu highgui imgproc legacy ml objdetect video)
+                install(FILES ${CMAKE_BINARY_DIR}/bin/Debug/opencv_${m}${OPENCV_DLLVERSION}d.dll
             DESTINATION bin COMPONENT main)
-                install(FILES ${CMAKE_BINARY_DIR}/lib/Debug/${m}${OPENCV_DLLVERSION}d.lib
+                install(FILES ${CMAKE_BINARY_DIR}/lib/Debug/opencv_${m}${OPENCV_DLLVERSION}d.lib
             DESTINATION lib COMPONENT main)
             endforeach()
         endif()
 
         install(DIRECTORY data samples DESTINATION "." COMPONENT main PATTERN ".svn" EXCLUDE)
-        install(DIRECTORY 3rdparty apps interfaces src tests utils DESTINATION "." COMPONENT src PATTERN ".svn" EXCLUDE)
+        install(DIRECTORY 3rdparty android modules tests utils DESTINATION "." COMPONENT src PATTERN ".svn" EXCLUDE)
         install(DIRECTORY doc/ DESTINATION doc COMPONENT src FILES_MATCHING PATTERN "*.tex")
         install(DIRECTORY doc/pics DESTINATION doc COMPONENT src PATTERN ".svn" EXCLUDE)
-        install(DIRECTORY doc/plastex DESTINATION doc COMPONENT src PATTERN ".svn" EXCLUDE)
+        install(DIRECTORY doc/latex2sphinx DESTINATION doc COMPONENT src PATTERN ".svn" EXCLUDE)
 
     endif()
 endif()
diff --git a/Package.cmake.in b/Package.cmake.in
index 6e8ea9c8e..e6ad5b9a8 100644
--- a/Package.cmake.in
+++ b/Package.cmake.in
@@ -7,11 +7,11 @@
 if(MSVC)
     set(CMAKE_INSTALL_DEBUG_LIBRARIES 1)
 endif()
-if(ENABLE_OPENMP)
-    set(CMAKE_INSTALL_OPENMP_LIBRARIES 1)
-endif()
+#if(ENABLE_OPENMP)
+#    set(CMAKE_INSTALL_OPENMP_LIBRARIES 1)
+#endif()
 #include(OpenCVInstallRequiredSystemLibraries.cmake)
-#include(InstallRequiredSystemLibraries)
+include(InstallRequiredSystemLibraries)
 
 set(CPACK_PACKAGE_NAME "OpenCV")
 set(CPACK_PACKAGE_VENDOR "OpenCV project opencvlibrary.sourceforge.net")
@@ -82,6 +82,7 @@ if(WIN32)
         "doc\\\\opencv.pdf" "The Reference Manual"
         "CMakeLists.txt" "The Build Script (open with CMake)"
         "samples\\\\c" "C Samples"
+        "samples\\\\cpp" "C++ Samples"
         "samples\\\\python" "Python Samples")
     
     # Add "<install_path>/bin" to the system PATH