diff --git a/infra/.beman_submodule b/infra/.beman_submodule
index 628b5d0..26f1dbf 100644
--- a/infra/.beman_submodule
+++ b/infra/.beman_submodule
@@ -1,3 +1,3 @@
 [beman_submodule]
 remote=https://github.com/bemanproject/infra.git
-commit_hash=7b66b858d7f48428fca936184aef2bd246ccc81a
+commit_hash=749c5588afe37daaa290b659d439cd7cd473ad1b
diff --git a/infra/cmake/enable-experimental-import-std.cmake b/infra/cmake/enable-experimental-import-std.cmake
index e41a5f7..3c6d688 100644
--- a/infra/cmake/enable-experimental-import-std.cmake
+++ b/infra/cmake/enable-experimental-import-std.cmake
@@ -1,5 +1,9 @@
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-if(CMAKE_VERSION VERSION_GREATER_EQUAL "4.3.0")
+if(CMAKE_VERSION VERSION_GREATER_EQUAL "4.4.0")
+    set(CMAKE_EXPERIMENTAL_CXX_IMPORT_STD
+        "f35a9ac6-8463-4d38-8eec-5d6008153e7d"
+    )
+elseif(CMAKE_VERSION VERSION_GREATER_EQUAL "4.3.0")
     set(CMAKE_EXPERIMENTAL_CXX_IMPORT_STD
         "451f2fe2-a8a2-47c3-bc32-94786d8fc91b"
     )
diff --git a/infra/cmake/llvm-libc++-toolchain.cmake b/infra/cmake/llvm-libc++-toolchain.cmake
index eabf363..aac8502 100644
--- a/infra/cmake/llvm-libc++-toolchain.cmake
+++ b/infra/cmake/llvm-libc++-toolchain.cmake
@@ -16,5 +16,8 @@
 include(${CMAKE_CURRENT_LIST_DIR}/llvm-toolchain.cmake)
 
 if(NOT CMAKE_CXX_FLAGS MATCHES "-stdlib=libc\\+\\+")
-    string(APPEND CMAKE_CXX_FLAGS " -stdlib=libc++")
+    string(
+        APPEND CMAKE_CXX_FLAGS
+        " -stdlib=libc++ -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0"
+    )
 endif()