diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3d371af7b18bc5ad7d0b994465696c2bb1204987..2110e14be06187c48e66ab7f1ba5771420854b47 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -52,7 +52,7 @@ webserver-deploy:
     - mkdir build
     - cd build
     - echo cmake %CMAKE_ARGS% %CMAKE_ARGS_WINDOWS% -DNANOGUI_DIR="C:/Program Files (x86)/NanoGUI" ..
-    - cmake %CMAKE_ARGS% %CMAKE_ARGS_WINDOWS% -DNANOGUI_DIR="C:/Program Files (x86)/NanoGUI" ..
+    - cmake %CMAKE_ARGS% %CMAKE_ARGS_WINDOWS% -DREALSENSE_DIR="C:/Program Files (x86)/Intel RealSense SDK 2.0" -DNANOGUI_DIR="C:/Program Files (x86)/NanoGUI" ..
     - devenv ftl.utu.fi.sln /build Release
     - rmdir /q /s "%DEPLOY_DIR%/%CI_COMMIT_REF_SLUG%"
     - mkdir "%DEPLOY_DIR%/%CI_COMMIT_REF_SLUG%"
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2f6d5b6d5e4db2bd15396934089e88847a0b61ac..1991d5345a5c0b567b5d69897fdf57b3c6689d7d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -92,13 +92,23 @@ else()
 endif()
 endif()
 
-find_library( REALSENSE_LIBRARY NAMES realsense2 librealsense2)
+find_library( REALSENSE_LIBRARY NAMES realsense2 librealsense2 PATHS ${REALSENSE_DIR} PATH_SUFFIXES lib/x64)
 if (REALSENSE_LIBRARY)
 	set(HAVE_REALSENSE TRUE)
 	add_library(realsense UNKNOWN IMPORTED)
 	#set_property(TARGET nanogui PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${NANOGUI_EXTRA_INCS})
 	set_property(TARGET realsense PROPERTY IMPORTED_LOCATION ${REALSENSE_LIBRARY})
-    message(STATUS "Found Realsense SDK: ${REALSENSE_LIBRARY}")
+	message(STATUS "Found Realsense SDK: ${REALSENSE_LIBRARY}")
+	
+	if(WIN32)
+		# Find include
+		find_path(REALSENSE_INCLUDE_DIRS
+		    NAMES librealsense2/rs.hpp
+		    PATHS "C:/Program Files/Intel RealSense SDK 2.0" "C:/Program Files (x86)/Intel RealSense SDK 2.0" ${REALSENSE_DIR}
+		    PATH_SUFFIXES include
+		)
+		set_property(TARGET realsense PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${REALSENSE_INCLUDE_DIRS})
+	endif()
 else()
 	set(REALSENSE_LIBRARY "")
 endif()