diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0e45976..469cb61 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.16...3.30)
+cmake_minimum_required(VERSION 3.16...4.1)
 
 include(cmake/RecordCmdLine.cmake)
 
diff --git a/cmake/VecCoreConfig.cmake.in b/cmake/VecCoreConfig.cmake.in
index 27310a3..9c52c93 100644
--- a/cmake/VecCoreConfig.cmake.in
+++ b/cmake/VecCoreConfig.cmake.in
@@ -17,13 +17,11 @@ list(APPEND CMAKE_MODULE_PATH "${VecCore_CMAKE_DIR}")
 include(CMakeFindDependencyMacro)
 
 if (VecCore_FIND_COMPONENTS MATCHES "CUDA")
-  include(CheckLanguage)
-  check_language(CUDA)
-  if(CMAKE_CUDA_COMPILER)
-    enable_language(CUDA)
+  find_dependency(CUDAToolkit)
+  if(CUDAToolkit_FOUND)
     set(VecCore_CUDA_FOUND True)
     set(VecCore_CUDA_DEFINITIONS -DVECCORE_ENABLE_CUDA)
-    set(VecCore_CUDA_INCLUDE_DIR ${CMAKE_CUDA_TOOLKIT_INCLUDE_DIRECTORIES})
+    set(VecCore_CUDA_INCLUDE_DIR ${CUDAToolkit_INCLUDE_DIRS})
   endif()
 endif()
 
@@ -80,3 +78,8 @@ if (VecCore_FOUND AND NOT TARGET VecCore::VecCore)
       INTERFACE_LINK_LIBRARIES "${VecCore_LIBRARIES}")
   endif()
 endif()
+
+# Print a pretty message if the caller doesn't have a FindVecGeom.cmake
+include(FindPackageHandleStandardArgs)
+set(${CMAKE_FIND_PACKAGE_NAME}_CONFIG "${CMAKE_CURRENT_LIST_FILE}")
+find_package_handle_standard_args(@PROJECT_NAME@ CONFIG_MODE HANDLE_COMPONENTS)