diff --git a/CMakeLists.txt b/CMakeLists.txt
index dfa14555..bd3307bf 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -56,7 +56,7 @@ check_cxx_compiler_flag("-Wundef"               TOML11_COMPILER_SUPPORTS_WUNDEF)
 check_cxx_compiler_flag("-Wshadow"              TOML11_COMPILER_SUPPORTS_WSHADOW)
 
 include(GNUInstallDirs)
-set(TOML11_INSTALL_CMAKE_DIR   ${CMAKE_INSTALL_LIBDIR}/cmake/toml11)
+set(TOML11_INSTALL_CMAKE_DIR   ${CMAKE_INSTALL_DATAROOTDIR}/cmake/toml11)
 set(TOML11_INSTALL_INCLUDE_DIR ${CMAKE_INSTALL_INCLUDEDIR})
 set(TOML11_CONFIG_DIR          ${CMAKE_CURRENT_BINARY_DIR}/cmake)
 set(TOML11_CONFIG              ${TOML11_CONFIG_DIR}/toml11Config.cmake)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index c65307ff..c4ae758e 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -153,6 +153,7 @@ if(TOML11_INSTALL)
     write_basic_package_version_file(${TOML11_CONFIG_VERSION}
         VERSION ${toml11_VERSION}
         COMPATIBILITY SameMajorVersion
+        ARCH_INDEPENDENT
         )
 
     configure_package_config_file(