diff --git a/DevIL/CMakeLists.txt b/DevIL/CMakeLists.txt
index e342f93d..3d12dda4 100644
--- a/DevIL/CMakeLists.txt
+++ b/DevIL/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 2.6)
 
 project(ImageLib)
 # include our custom modules
-set (CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules")
+list (APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules")
 
 add_subdirectory(src-IL)
 add_subdirectory(src-ILU)
diff --git a/DevIL/src-IL/CMakeLists.txt b/DevIL/src-IL/CMakeLists.txt
index 3cda85cf..6e7b4c91 100644
--- a/DevIL/src-IL/CMakeLists.txt
+++ b/DevIL/src-IL/CMakeLists.txt
@@ -36,11 +36,18 @@ if(WIN32)
 		add_definitions(-DIL_DLL -DJPEGSTATIC)
         # note: .def not used for now - __declspec() in source handles export.
         set(DevIL_SRCS ${DevIL_SRCS} msvc/il.def)
-		if(UNICODE)
-			set(DevIL_RSRC ${DevIL_RSRC} "msvc/resources/IL Logo.ico" "msvc/IL Unicode.rc")
-		else(UNICODE)
-			set(DevIL_RSRC ${DevIL_RSRC} "msvc/resources/IL Logo.ico" "msvc/IL.rc")
-		endif(UNICODE)
+		if(${MSVC_VERSION} GREATER 1899) # MSVC 2015 or later
+			option(DEVIL_INCLUDE_RESOURCES "DevIL: compile-in resources" OFF)
+		else()
+			option(DEVIL_INCLUDE_RESOURCES "DevIL: compile-in resources" ON)
+		endif()
+		if(DEVIL_INCLUDE_RESOURCES)
+			if(UNICODE)
+				set(DevIL_RSRC ${DevIL_RSRC} "msvc/resources/IL Logo.ico" "msvc/IL Unicode.rc")
+			else(UNICODE)
+				set(DevIL_RSRC ${DevIL_RSRC} "msvc/resources/IL Logo.ico" "msvc/IL.rc")
+			endif(UNICODE)
+		endif(DEVIL_INCLUDE_RESOURCES)
         set(DevIL_TXT ${DevIL_TXT} ../AUTHORS ../ChangeLog ../CREDITS ../libraries.txt ../README.md ../README.cmake ../TODO)
 #		SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /NODEFAULTLIB:msvcrt.lib ")
 		set(CMAKE_C_FLAGS_RELEASE "/MT /O2")
@@ -293,11 +300,11 @@ if(IL_USE_DXTC_SQUISH)
 endif(IL_USE_DXTC_SQUISH)
 
 
-include_directories(${incs})
+include_directories(${incs} "${CMAKE_CURRENT_BINARY_DIR}/include")
 target_link_libraries(IL ${libs})
 
 # generate config.h
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/include/config.h.cmake.in ${CMAKE_CURRENT_SOURCE_DIR}/include/config.h)
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/include/config.h.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/include/config.h)