diff --git a/CHANGELOG.md b/CHANGELOG.md
index a68810e478e4..8c27f717a10b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,6 +17,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Deprecated
 
+## [2.40.4] - 2023-09-14
+
+### Fixed
+
+- Fixed handling of MAPL dependencies for when `find_package(MAPL)` is used
+
 ## [2.40.3] - 2023-08-03
 
 ### Changed
diff --git a/cmake/mapl-import.cmake.in b/cmake/mapl-import.cmake.in
deleted file mode 100644
index 2d43afdb8051..000000000000
--- a/cmake/mapl-import.cmake.in
+++ /dev/null
@@ -1,3 +0,0 @@
-list (APPEND CMAKE_MODULE_PATH @MAPL_FULL_INSTALL_DATA_DIR@/cmake)
-include (mapl_create_stub_component)
-include (mapl_acg)
diff --git a/mapl-import.cmake.in b/mapl-import.cmake.in
new file mode 100644
index 000000000000..d7b4afd38821
--- /dev/null
+++ b/mapl-import.cmake.in
@@ -0,0 +1,29 @@
+include(CMakeFindDependencyMacro)
+
+find_dependency(MPI COMPONENTS Fortran REQUIRED)
+find_dependency(NetCDF COMPONENTS Fortran REQUIRED)
+find_dependency(OpenMP COMPONENTS Fortran REQUIRED)
+
+set(GFTL_FOUND @GFTL_FOUND@)
+if(GFTL_FOUND)
+   find_dependency(GFTL HINTS @GFTL_DIR@)
+endif()
+
+set(GFTL_SHARED_FOUND @GFTL_SHARED_FOUND@)
+if(GFTL_SHARED_FOUND)
+   find_dependency(GFTL_SHARED HINTS @GFTL_SHARED_DIR@)
+endif()
+
+set(FARGPARSE_FOUND @FARGPARSE_FOUND@)
+if(FARGPARSE_FOUND)
+   find_dependency(FARGPARSE HINTS @FARGPARSE_DIR@)
+endif()
+
+set(PFLOGGER_FOUND @PFLOGGER_FOUND@)
+if(PFLOGGER_FOUND)
+   find_dependency(PFLOGGER HINTS @PFLOGGER_DIR@)
+endif()
+
+list (APPEND CMAKE_MODULE_PATH @MAPL_FULL_INSTALL_DATA_DIR@/cmake)
+include (mapl_create_stub_component)
+include (mapl_acg)