diff --git a/pkgs/by-name/oc/octomap/package.nix b/pkgs/by-name/oc/octomap/package.nix
index 734bcb7630a6..559cfd7eacd1 100644
--- a/pkgs/by-name/oc/octomap/package.nix
+++ b/pkgs/by-name/oc/octomap/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch2,
   cmake,
 }:
 
@@ -18,6 +19,22 @@ stdenv.mkDerivation (finalAttrs: {
 
   sourceRoot = "${finalAttrs.src.name}/octomap";
 
+  patches = [
+    (fetchpatch2 {
+      name = "prepare-for-next-patch.patch";
+      url = "https://github.com/OctoMap/octomap/commit/c5c714139a82969915b84cd5548dedcd257ebf1e.patch?full_index=1";
+      stripLen = 1;
+      excludes = [ ".gitignore" ];
+      hash = "sha256-p/qvBiqeZt93aI7p7MYG6SUwcRlchHV9AnXKVTzBhRs=";
+    })
+    (fetchpatch2 {
+      name = "fix-gcc16.patch";
+      url = "https://github.com/OctoMap/octomap/commit/d7e54ca1c4074f88381c07bfdd685bd4fced0636.patch?full_index=1";
+      stripLen = 1;
+      hash = "sha256-8ZwX1CJFykMduEEXIqTRH9VHn7ItvO/ZfdNNDIDmtss=";
+    })
+  ];
+
   nativeBuildInputs = [ cmake ];
 
   strictDeps = true;