diff --git a/CMakeLists.txt b/CMakeLists.txt
index 60300dc..6d75564 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -91,8 +91,8 @@ SET_PACKAGE_PROPERTIES(Doxygen PROPERTIES URL "http://www.doxygen.org/" DESCRIPT
 OPTION( USE_OPENCV "Add OpenCV support" ON )
 SET( OPENCV_OPTFLOW_FOUND OFF )
 IF( USE_OPENCV )
-  FIND_PACKAGE( OpenCV COMPONENTS core highgui video )
-  LIST(APPEND OPENCV_MODULES core highgui video )
+  LIST(APPEND OPENCV_MODULES core highgui imgproc video )
+  FIND_PACKAGE( OpenCV COMPONENTS  ${OPENCV_MODULES} )
   SET(USE_OPENCV ${OpenCV_FOUND})
 ENDIF()
 SET_PACKAGE_PROPERTIES(OpenCV PROPERTIES URL "http://opencv.willowgarage.com" DESCRIPTION "OpenCV library support in PlaYUVerFrame" TYPE OPTIONAL)
diff --git a/cmake/ModulesFct.cmake b/cmake/ModulesFct.cmake
index e5e7c53..5dd24a8 100644
--- a/cmake/ModulesFct.cmake
+++ b/cmake/ModulesFct.cmake
@@ -25,6 +25,8 @@ MACRO(ADD_MODULE_USE_OPENCV name file )
         FIND_PACKAGE( OpenCV QUIET COMPONENTS ${opencv_module} )
         IF( NOT ${OPENCV_${opencv_moduleUP}_FOUND} EQUAL "1" )
           SET( _HAS_MODULES FALSE )
+        ELSE()
+          LIST(APPEND OPENCV_MODULES ${opencv_module} )
         ENDIF()
       ENDFOREACH()
       IF( _HAS_MODULES )
diff --git a/cmake/Win32.cmake b/cmake/Win32.cmake
index 9030f69..b9bb01d 100644
--- a/cmake/Win32.cmake
+++ b/cmake/Win32.cmake
@@ -36,25 +36,10 @@ IF( NOT USE_QT4 )
 ENDIF()
 
 IF( USE_OPENCV )
-  SET( DEPENDENCIES_STRING "${DEPENDENCIES_STRING}OPENCV" )
-  IF( WIN32 )
-    SET(OpenCV_DLL_DIR "${OpenCV_DIR}/bin" CACHE PATH "Where to find OpenCV dlls")
-    INSTALL(FILES ${OpenCV_DLL_DIR}/opencv_core${OpenCV_VERSION_MAJOR}${OpenCV_VERSION_MINOR}${OpenCV_VERSION_PATCH}.dll DESTINATION bin )
-    INSTALL(FILES ${OpenCV_DLL_DIR}/opencv_highgui${OpenCV_VERSION_MAJOR}${OpenCV_VERSION_MINOR}${OpenCV_VERSION_PATCH}.dll DESTINATION bin )
-    INSTALL(FILES ${OpenCV_DLL_DIR}/opencv_imgproc${OpenCV_VERSION_MAJOR}${OpenCV_VERSION_MINOR}${OpenCV_VERSION_PATCH}.dll DESTINATION bin )
-    INSTALL(FILES ${OpenCV_DLL_DIR}/opencv_calib3d${OpenCV_VERSION_MAJOR}${OpenCV_VERSION_MINOR}${OpenCV_VERSION_PATCH}.dll DESTINATION bin )
-    INSTALL(FILES ${OpenCV_DLL_DIR}/opencv_features2d${OpenCV_VERSION_MAJOR}${OpenCV_VERSION_MINOR}${OpenCV_VERSION_PATCH}.dll DESTINATION bin )
-    INSTALL(FILES ${OpenCV_DLL_DIR}/opencv_flann${OpenCV_VERSION_MAJOR}${OpenCV_VERSION_MINOR}${OpenCV_VERSION_PATCH}.dll DESTINATION bin )
-    INSTALL(FILES ${OpenCV_DLL_DIR}/opencv_ml${OpenCV_VERSION_MAJOR}${OpenCV_VERSION_MINOR}${OpenCV_VERSION_PATCH}.dll DESTINATION bin )
-    INSTALL(FILES ${OpenCV_DLL_DIR}/opencv_video${OpenCV_VERSION_MAJOR}${OpenCV_VERSION_MINOR}${OpenCV_VERSION_PATCH}.dll DESTINATION bin )
-    INSTALL(FILES ${OpenCV_DLL_DIR}/opencv_videostab${OpenCV_VERSION_MAJOR}${OpenCV_VERSION_MINOR}${OpenCV_VERSION_PATCH}.dll DESTINATION bin )
-    INSTALL(FILES ${OpenCV_DLL_DIR}/opencv_superres${OpenCV_VERSION_MAJOR}${OpenCV_VERSION_MINOR}${OpenCV_VERSION_PATCH}.dll DESTINATION bin )
-    INSTALL(FILES ${OpenCV_DLL_DIR}/opencv_stitching${OpenCV_VERSION_MAJOR}${OpenCV_VERSION_MINOR}${OpenCV_VERSION_PATCH}.dll DESTINATION bin )
-    INSTALL(FILES ${OpenCV_DLL_DIR}/opencv_photo${OpenCV_VERSION_MAJOR}${OpenCV_VERSION_MINOR}${OpenCV_VERSION_PATCH}.dll DESTINATION bin )
-    INSTALL(FILES ${OpenCV_DLL_DIR}/opencv_objdetect${OpenCV_VERSION_MAJOR}${OpenCV_VERSION_MINOR}${OpenCV_VERSION_PATCH}.dll DESTINATION bin )
-  ENDIF()
-  LIST(APPEND CPACK_DEBIAN_PACKAGE_DEPENDS ",")
-  LIST(APPEND CPACK_DEBIAN_PACKAGE_DEPENDS "libopencv-dev (>= 2.4.8)")
+  SET(OpenCV_DLL_DIR "${OpenCV_DIR}/bin" CACHE PATH "Where to find OpenCV dlls")
+  FOREACH(opencv_module IN LISTS OPENCV_MODULES )
+    INSTALL(FILES ${OpenCV_DLL_DIR}/opencv_${opencv_module}${OpenCV_VERSION_MAJOR}${OpenCV_VERSION_MINOR}${OpenCV_VERSION_PATCH}.dll DESTINATION bin )
+  ENDFOREACH()
 ENDIF()
 
 IF( USE_FFMPEG )