diff --git a/CMakeLists.txt b/CMakeLists.txt
index 38b5ba17..ccf71c51 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -86,8 +86,8 @@ if(XTENSOR_USE_XSIMD)
 endif()
 
 if(XTENSOR_USE_TBB)
-    set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH}" "${CMAKE_CURRENT_SOURCE_DIR}/cmake/")
-    find_package(TBB REQUIRED)
+    #set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH}" "${CMAKE_CURRENT_SOURCE_DIR}/cmake/")
+    find_package(TBB CONFIG REQUIRED)
     message(STATUS "Found intel TBB: ${TBB_INCLUDE_DIRS}")
 endif()
 
@@ -272,7 +272,7 @@ export(EXPORT ${PROJECT_NAME}-targets
 install(DIRECTORY ${XTENSOR_INCLUDE_DIR}/xtensor
         DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
 
-set(XTENSOR_CMAKECONFIG_INSTALL_DIR "${CMAKE_INSTALL_DATADIR}/cmake/${PROJECT_NAME}" CACHE
+set(XTENSOR_CMAKECONFIG_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}" CACHE
     STRING "install path for xtensorConfig.cmake")
 
 configure_package_config_file(${PROJECT_NAME}Config.cmake.in
@@ -299,7 +299,7 @@ configure_file(${PROJECT_NAME}.pc.in
                "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc"
                 @ONLY)
 install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc"
-        DESTINATION "${CMAKE_INSTALL_DATADIR}/pkgconfig/")
+        DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig/")
 
 install(DIRECTORY ${XTENSOR_TAGFILES_DIR}
         DESTINATION ${XTENSOR_DATA_DIR})