diff --git a/CMakeLists.txt b/CMakeLists.txt
index b971c6aa..35f33b74 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -125,7 +125,6 @@ install(
     FILES
         ${CMAKE_BINARY_DIR}/_QSkinny/${PACKAGE_NAME}Config.cmake
         ${CMAKE_BINARY_DIR}/_QSkinny/${PACKAGE_NAME}ConfigVersion.cmake
-        ${QSK_CMAKE_DIR}/QskTools.cmake
     DESTINATION
         ${PACKAGE_LOCATION}
     COMPONENT
diff --git a/cmake/QSkinnyConfig.cmake b/cmake/QSkinnyConfig.cmake
index fbffae9e..14ab054c 100644
--- a/cmake/QSkinnyConfig.cmake
+++ b/cmake/QSkinnyConfig.cmake
@@ -1 +1,3 @@
 include("${CMAKE_CURRENT_LIST_DIR}/QSkinnyTargets.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/QskTools.cmake" OPTIONAL)
+include("${CMAKE_CURRENT_LIST_DIR}/QmlExportTargets.cmake" OPTIONAL)
diff --git a/cmake/QskBuildFunctions.cmake b/cmake/QskBuildFunctions.cmake
index 8df27d65..32a0fa52 100644
--- a/cmake/QskBuildFunctions.cmake
+++ b/cmake/QskBuildFunctions.cmake
@@ -115,11 +115,3 @@ function(qsk_add_shaders target)
         PREFIX "/qskinny/shaders" ${ARGV} OUTPUTS ${outfiles} )
 
 endfunction()
-
-function(qsk_update_package_config_file target)
-
-    file(APPEND
-        ${CMAKE_BINARY_DIR}/_QSkinny/QSkinnyConfig.cmake
-        "include(\"\${CMAKE_CURRENT_LIST_DIR}/${target}.cmake\")\n")
-
-endfunction()
diff --git a/qmlexport/CMakeLists.txt b/qmlexport/CMakeLists.txt
index e3ca96c0..30a29ea8 100644
--- a/qmlexport/CMakeLists.txt
+++ b/qmlexport/CMakeLists.txt
@@ -42,5 +42,3 @@ install(EXPORT ${PACKAGE_NAME}Targets
         ${PACKAGE_NAMESPACE}
     DESTINATION
         ${PACKAGE_LOCATION})
-
-qsk_update_package_config_file(${PACKAGE_NAME}Targets)
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index 74d10d19..53162269 100644
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -1,4 +1,10 @@
 if(TARGET Qt::Svg)
     add_subdirectory(svg2qvg)
-    qsk_update_package_config_file(QskTools)
+    install(
+        FILES
+            ${QSK_CMAKE_DIR}/QskTools.cmake
+        DESTINATION
+            ${PACKAGE_LOCATION}
+        COMPONENT
+            Devel)
 endif()