diff --git a/CMakeLists.txt b/CMakeLists.txt
index c56518b63..b160cfcf9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -147,6 +147,13 @@ ADD_SUBDIRECTORY(cmake)
 # Update (and then install) version.xml from their respective version.
 SD_UPDATE_SETTINGS_VERSION()
 
+IF(MSVC)
+   INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/doc/faq/faq.html DESTINATION ./doc)
+   INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/doc/userman/how_to_drive.html DESTINATION ./doc)
+   INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/doc/userman/images/ DESTINATION ./doc/images/)
+ENDIF(MSVC)
+
+
 # Usefull for using an installation of SD as a robot development framework without building it.
 INSTALL_SD_CMAKE()
 
diff --git a/packaging/windows/speed-dreams-base.nsi b/packaging/windows/speed-dreams-base.nsi
index 4e2b5403b..b5aefefa6 100644
--- a/packaging/windows/speed-dreams-base.nsi
+++ b/packaging/windows/speed-dreams-base.nsi
@@ -134,10 +134,7 @@ Section "!Base System" SEC01
 
   ; Documentation
   SetOutPath "$INSTDIR\doc"
-  File "..\..\doc\faq\faq.html"
-
-  SetOutPath "$INSTDIR\doc"
-  File /r /x .svn "..\..\doc\userman\*.*"
+  File /r /x .svn "${BUILD_INST_DIR}\doc\*.*"
 
   ; Base robots binaries
   SetOutPath "$INSTDIR\lib\drivers\human"
diff --git a/packaging/windows/speed-dreams.nsh.in b/packaging/windows/speed-dreams.nsh.in
index cf1e20b06..f315ee3ca 100644
--- a/packaging/windows/speed-dreams.nsh.in
+++ b/packaging/windows/speed-dreams.nsh.in
@@ -86,14 +86,14 @@ SetCompressor /SOLID lzma ; 1-block compression, smaller but longer (generation,
 !include "MUI.nsh" ; TODO: Move to MUI2
 
 !define MUI_HEADERIMAGE
-!define MUI_HEADERIMAGE_BITMAP "..\..\data\data\img\header.bmp"
+!define MUI_HEADERIMAGE_BITMAP "${BUILD_INST_DIR}\data\data\img\header.bmp"
 
-!define MUI_WELCOMEFINISHPAGE_BITMAP "..\..\data\data\img\header-vert.bmp"
+!define MUI_WELCOMEFINISHPAGE_BITMAP "${BUILD_INST_DIR}\data\data\img\header-vert.bmp"
 
 !define MUI_ABORTWARNING
 
-!define MUI_ICON "..\..\data\data\icons\icon.ico"
-!define MUI_UNICON "..\..\data\data\icons\icon.ico"
+!define MUI_ICON "${BUILD_INST_DIR}\data\data\icons\icon.ico"
+!define MUI_UNICON "${BUILD_INST_DIR}\data\data\icons\icon.ico"
 
 !define MUI_LICENSEPAGE_CHECKBOX