diff --git a/distros/distro-overlay.nix b/distros/distro-overlay.nix
index a825c6c98b..3f77fb2054 100644
--- a/distros/distro-overlay.nix
+++ b/distros/distro-overlay.nix
@@ -61,6 +61,19 @@ let
       nativeBuildInputs = [ setupHook ] ++ nativeBuildInputs;
     });
 
+    ament-cmake-export-targets = rosSuper.ament-cmake-export-targets.overrideAttrs ({
+      patches ? [], ...
+    }: {
+      patches = patches ++ [
+        # Support new target export template introduced with CMake 3.24
+        (self.fetchpatch {
+          url = "https://github.com/ament/ament_cmake/commit/ca8c26ea3c89e69c0c636b7cd0c088674c689f5f.patch";
+          stripLen = 1;
+          sha256 = "sha256-ATdzHaD+3R3rhplaNzkEQBRqpkQDHVJLiB2oNlzIjm4=";
+        })
+      ];
+    });
+
     camera-calibration-parsers = patchBoostPython rosSuper.camera-calibration-parsers;
 
     catkin = rosSuper.catkin.overrideAttrs ({