diff --git a/contrib/cmake/msvc/cmakeBuild.cmd b/contrib/cmake/msvc/cmakeBuild.cmd
index 667925d8..e50b94e7 100755
--- a/contrib/cmake/msvc/cmakeBuild.cmd
+++ b/contrib/cmake/msvc/cmakeBuild.cmd
@@ -271,15 +271,18 @@ pushd        "%EXIV_B%"
     set ENABLE_LIBSSH=-DEXIV2_ENABLE_SSH=OFF
     set ENABLE_WEBREADY=-DEXIV2_ENABLE_WEBREADY=OFF
     set ENABLE_VIDEO=-DEXIV2_ENABLE_VIDEO=OFF
+	set ENABLE_SHARED=ON
 
     if defined _CURL_     set ENABLE_CURL=-DEXIV2_ENABLE_CURL=ON
     if defined _LIBSSH_   set ENABLE_SSH=-DEXIV2_ENABLE_SSH=ON
     if defined _WEBREADY_ set ENABLE_WEBREADY=-DEXIV2_ENABLE_WEBREADY=ON
     if defined _VIDEO_    set ENABLE_VIDEO=-DEXIV2_ENABLE_VIDEO=ON
+	if /I "%_MODE_%" == "static" set ENABLE_SHARED=OFF
+
 
     call:run cmake -G "%_GENERATOR_%" -DCMAKE_BUILD_TYPE=%_CONFIG_% %_LINK_% -DCMAKE_INSTALL_PREFIX=%_INSTALL_% -DCMAKE_LIBRARY_PATH=%_LIBPATH_% -DCMAKE_INCLUDE_PATH=%_INCPATH_% ^
               -DEXIV2_ENABLE_NLS=OFF                -DEXIV2_ENABLE_BUILD_SAMPLES=ON ^
-              -DEXIV2_ENABLE_WIN_UNICODE=OFF        -DEXIV2_ENABLE_SHARED=ON ^
+              -DEXIV2_ENABLE_WIN_UNICODE=OFF        -DEXIV2_ENABLE_SHARED=%ENABLE_SHARED% ^
               %ENABLE_WEBREADY%  %ENABLE_CURL%  %ENABLE_LIBSSH% %ENABLE_VIDEO% ^
              "%_EXIV2_%"
 
diff --git a/samples/CMakeLists.txt b/samples/CMakeLists.txt
index 6b07398c..7476ea34 100644
--- a/samples/CMakeLists.txt
+++ b/samples/CMakeLists.txt
@@ -39,6 +39,11 @@ SET( SAMPLES addmoddel.cpp
              xmpsample.cpp
    )
 
+##
+# msvn tuning
+include(../CMake_msvc.txt)
+msvc_runtime_configure(${EXIV2_ENABLE_SHARED})
+
 FOREACH(entry ${SAMPLES})
     STRING( REPLACE ".cpp" "" target ${entry})
     ADD_EXECUTABLE( ${target} ${target}.cpp )
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 3b303c58..ce6b91fc 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -287,6 +287,9 @@ ENDIF(CYGWIN OR MINGW)
 
 INSTALL( TARGETS exiv2lib ${INSTALL_TARGET_STANDARD_ARGS} )
 
+include(../CMake_msvc.txt)
+msvc_runtime_configure(${EXIV2_ENABLE_SHARED})
+
 # ******************************************************************************
 # exiv2 application
 ADD_EXECUTABLE( exiv2 ${EXIV2_SRC} )