diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9c795812e..6c4c29a70 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -49,6 +49,30 @@ if (NOT DEFINED LIBDIR)
     endif (WIN32 OR APPLE)
 endif (NOT DEFINED LIBDIR)
 
+if (NOT DEFINED DOCDIR)
+    if (WIN32 OR APPLE)
+        set (DOCDIR ${CMAKE_CURRENT_SOURCE_DIR}/release/doc)
+    else (WIN32 OR APPLE)
+        set (DOCDIR ${CMAKE_INSTALL_PREFIX}/share/doc)
+    endif (WIN32 OR APPLE)
+endif (NOT DEFINED DOCDIR)
+
+if (NOT DEFINED CREDITSDIR)
+    if (WIN32 OR APPLE)
+        set (CREDITSDIR ${CMAKE_CURRENT_SOURCE_DIR}/release)
+    else (WIN32 OR APPLE)
+        set (CREDITSDIR ${CMAKE_INSTALL_PREFIX}/share/doc)
+    endif (WIN32 OR APPLE)
+endif (NOT DEFINED CREDITSDIR)
+
+if (NOT DEFINED LICENCEDIR)
+    if (WIN32 OR APPLE)
+        set (LICENCEDIR ${CMAKE_CURRENT_SOURCE_DIR}/release)
+    else (WIN32 OR APPLE)
+        set (LICENCEDIR ${CMAKE_INSTALL_PREFIX}/share/doc)
+    endif (WIN32 OR APPLE)
+endif (NOT DEFINED LICENCEDIR)
+
 # check for libraries
 find_package(PkgConfig)
 pkg_check_modules (GTK     REQUIRED gtk+-2.0>=2.12)
@@ -136,9 +160,8 @@ if (UNIX)
     install (PROGRAMS rtstart DESTINATION ${BINDIR})
 endif (UNIX)
 
-install (FILES AUTHORS.txt LICENSE.txt DESTINATION ${BINDIR})
-
-install (FILES AUTHORS.txt LICENSE.txt DESTINATION ${BINDIR})
+install (FILES AUTHORS.txt DESTINATION ${CREDITSDIR})
+install (FILES LICENSE.txt DESTINATION ${LICENCEDIR})
 
 add_subdirectory (rtexif)
 add_subdirectory (rtengine)
diff --git a/Win32CMakeOptions-Sample.txt b/Win32CMakeOptions-Sample.txt
index df000fe25..ff31a1e35 100644
--- a/Win32CMakeOptions-Sample.txt
+++ b/Win32CMakeOptions-Sample.txt
@@ -1,6 +1,6 @@
-# Use the 'Debug'          build type to have a non optimzed,        with    debugging information, with a console executable
-# Use the 'Release'        build type to have an    optimzed,        without debugging information, console free executable
-# Use the 'RelWithDebInfo' build type to have an    optimzed,        without debugging information, with a console executable
+# Use the 'Debug'          build type to have a non optimized,        with    debugging information, with a console executable
+# Use the 'Release'        build type to have an    optimized,        without debugging information, console free executable
+# Use the 'RelWithDebInfo' build type to have an    optimized,        without debugging information, with a console executable
 # Use the 'MinSizeRel'     build type to have the smallest possible, without debugging information, console free executable
 #set(CMAKE_BUILD_TYPE Release CACHE STRING "Between: None Debug Release RelWithDebInfo MinSizeRel.")
 
@@ -8,11 +8,14 @@ set(CMAKE_INSTALL_PREFIX ./Builds/${CMAKE_BUILD_TYPE} CACHE PATH "Libraries inst
 set(DATADIR . CACHE PATH "Datas installation path")
 set(BINDIR . CACHE PATH "Binaries installation path")
 set(LIBDIR . CACHE PATH "Libraries installation path")
+set(DOCDIR ./doc CACHE PATH "Documentation installation path")
+set(CREDITSDIR . CACHE PATH "Credit file installation path")
+set(LICENCEDIR . CACHE PATH "Licence file installation path")
 
 set(BUILD_SHARED OFF CACHE BOOL "Should RT generate shared libraries")
 set(WITH_RAWZOR ON CACHE BOOL "With Rawzor")
 set(OPTION_OMP ON CACHE BOOL "Use OpenMP to speedup the preview and batch processing")
-# set WITH_MYFILE_MMAP to OFF if you experience crash whith thumbnail creation (it should be slower, but more reliable)
+# set WITH_MYFILE_MMAP to OFF if you experience crash with thumbnail creation (it should be slower, but more reliable)
 set(WITH_MYFILE_MMAP ON CACHE BOOL "Use the MMAP mechanism to speedup thumbnail creations")
 
 # Tune the build to your CPU and its instruction set