diff --git a/CMakeLists.txt b/CMakeLists.txt
index abd298f8..ba52ded8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -141,7 +141,7 @@ CMAKE_DEPENDENT_OPTION(TESTS_DYNAMIC_LOADING_EXAMPLES "Enable build of dynamic l
 add_library(sol2 INTERFACE)
 target_include_directories(sol2 INTERFACE
 	$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
-	$<INSTALL_INTERFACE:include/sol>)
+	$<INSTALL_INTERFACE:include>)
 
 # # Version configurations
 configure_package_config_file(
diff --git a/cmake/sol2-config.cmake.in b/cmake/sol2-config.cmake.in
index 9c69beb4..e43edddf 100644
--- a/cmake/sol2-config.cmake.in
+++ b/cmake/sol2-config.cmake.in
@@ -26,13 +26,16 @@ include("${CMAKE_CURRENT_LIST_DIR}/sol2-targets.cmake")
 
 MESSAGE(STATUS ${CMAKE_CURRENT_LIST_DIR})
 
-get_target_property(SOL_INCLUDE_DIRS
-	sol2 INTERFACE_INCLUDE_DIRECTORIES)
+if (TARGET sol2)
+    get_target_property(SOL2_INCLUDE_DIRS
+        sol2 INTERFACE_INCLUDE_DIRECTORIES)
+    set_and_check(SOL2_INCLUDE_DIRS "${SOL2_INCLUDE_DIRS}")
+    set(SOL2_LIBRARIES sol2)
+endif()
 
-get_target_property(SOL_SINGLE_INCLUDE_DIRS
-	sol2_single INTERFACE_INCLUDE_DIRECTORIES)
-
-set_and_check(SOL2_INCLUDE_DIRS "${SOL2_INCLUDE_DIRS}")
-set_and_check(SOL2_INCLUDE_DIRS "${SOL2_SINGLE_INCLUDE_DIRS}")
-set(SOL2_LIBRARIES sol2)
-set(SOL2_LIBRARIES_SINGLE sol2_single)
+if(TARGET sol2_single)
+    get_target_property(SOL2_SINGLE_INCLUDE_DIRS
+        sol2_single INTERFACE_INCLUDE_DIRECTORIES)
+    set_and_check(SOL2_INCLUDE_DIRS "${SOL2_SINGLE_INCLUDE_DIRS}")
+    set(SOL2_LIBRARIES_SINGLE sol2_single)
+endif()