diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6ed56a8..66d1e66 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -210,15 +210,9 @@ else()
 endif()
 
 if(ENABLE_SPIRV_TOOLS_INSTALL)
-  if(WIN32)
-    macro(spvtools_config_package_dir TARGET PATH)
-      set(${PATH} ${TARGET}/cmake)
-    endmacro()
-  else()
-    macro(spvtools_config_package_dir TARGET PATH)
-      set(${PATH} ${CMAKE_INSTALL_LIBDIR}/cmake/${TARGET})
-    endmacro()
-  endif()
+  macro(spvtools_config_package_dir TARGET PATH)
+    set(${PATH} ${CMAKE_INSTALL_DATADIR}/${TARGET})
+  endmacro()
 
   macro(spvtools_generate_config_file TARGET)
     file(WRITE ${CMAKE_BINARY_DIR}/${TARGET}Config.cmake
diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
index 4e7e10c..278e439 100644
--- a/source/CMakeLists.txt
+++ b/source/CMakeLists.txt
@@ -387,7 +387,7 @@ if("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")
 endif()
 
 if(ENABLE_SPIRV_TOOLS_INSTALL)
-  install(TARGETS ${SPIRV_TOOLS} ${SPIRV_TOOLS}-shared EXPORT ${SPIRV_TOOLS}Targets
+  install(TARGETS ${SPIRV_TOOLS} EXPORT ${SPIRV_TOOLS}Targets
     RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
     LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
     ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})