diff --git a/ports/fixed-containers/add-install-configuration.patch b/ports/fixed-containers/add-install-configuration.patch
new file mode 100644
index 0000000000..9569bdfdbc
--- /dev/null
+++ b/ports/fixed-containers/add-install-configuration.patch
@@ -0,0 +1,35 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 2738060..4f3aedd 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -236,6 +236,13 @@ if (FIXED_CONTAINERS_OPT_INSTALL)
+     target_include_directories(fixed_containers INTERFACE $<INSTALL_INTERFACE:include>)
+ 
+     include(CMakePackageConfigHelpers)
++
++    configure_package_config_file(
++      ${PROJECT_NAME}Config.cmake.in
++      "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake"
++      INSTALL_DESTINATION lib/cmake/${PROJECT_NAME}/
++      NO_CHECK_REQUIRED_COMPONENTS_MACRO)
++
+     write_basic_package_version_file(${PROJECT_NAME}ConfigVersion.cmake
+             VERSION "0.0.0"
+             COMPATIBILITY AnyNewerVersion
+@@ -249,11 +256,14 @@ if (FIXED_CONTAINERS_OPT_INSTALL)
+ 
+     install(EXPORT ${PROJECT_NAME}Config
+             NAMESPACE ${PROJECT_NAME}::
++            FILE ${PROJECT_NAME}-targets.cmake
+             DESTINATION lib/cmake/${PROJECT_NAME})
+ 
+     install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include
+             DESTINATION .)
+ 
+-    export(EXPORT ${PROJECT_NAME}Config
+-            NAMESPACE ${PROJECT_NAME}::)
++    install(
++      FILES
++      "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake"
++      DESTINATION lib/cmake/${PROJECT_NAME})
+ endif()
diff --git a/ports/fixed-containers/fixed_containersConfig.cmake.in b/ports/fixed-containers/fixed_containersConfig.cmake.in
new file mode 100644
index 0000000000..a8e659e0aa
--- /dev/null
+++ b/ports/fixed-containers/fixed_containersConfig.cmake.in
@@ -0,0 +1,9 @@
+
+@PACKAGE_INIT@
+
+include(CMakeFindDependencyMacro)
+
+find_dependency(magic_enum CONFIG)
+
+include("${CMAKE_CURRENT_LIST_DIR}/fixed_containers-targets.cmake")
+
diff --git a/ports/fixed-containers/portfile.cmake b/ports/fixed-containers/portfile.cmake
new file mode 100644
index 0000000000..1106d1fe91
--- /dev/null
+++ b/ports/fixed-containers/portfile.cmake
@@ -0,0 +1,27 @@
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO teslamotors/fixed-containers
+    REF 1ad10a6ca835611124f54a1d8ed04bcf7ab53da4
+    SHA512 71b7ea86ed45bac39c2f22c572f84d3a9862aab350eeef5d72c6061d42c10bf7fad26cafc6c6b991cdf3ac758b23c29fd8d3414f1b2af7c65058bc31d000b49b
+    HEAD_REF main
+    PATCHES add-install-configuration.patch
+)
+
+set(VCPKG_BUILD_TYPE release) # header-only
+
+file(COPY "${CMAKE_CURRENT_LIST_DIR}/fixed_containersConfig.cmake.in" DESTINATION "${SOURCE_PATH}")
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+    -DBUILD_TESTS=OFF
+    -DFIXED_CONTAINERS_OPT_INSTALL=ON
+)
+
+vcpkg_cmake_install()
+
+vcpkg_cmake_config_fixup(PACKAGE_NAME fixed_containers CONFIG_PATH lib/cmake/fixed_containers)
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib")
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/ports/fixed-containers/vcpkg.json b/ports/fixed-containers/vcpkg.json
new file mode 100644
index 0000000000..6d937185fd
--- /dev/null
+++ b/ports/fixed-containers/vcpkg.json
@@ -0,0 +1,18 @@
+{
+  "name": "fixed-containers",
+  "version-date": "2024-09-19",
+  "description": "C++ Fixed Containers",
+  "homepage": "https://github.com/teslamotors/fixed-containers",
+  "license": "MIT",
+  "dependencies": [
+    "magic-enum",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
+}
diff --git a/versions/baseline.json b/versions/baseline.json
index d7f9863e06..16f19f1d3f 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -2756,6 +2756,10 @@
       "baseline": "2023-07-31",
       "port-version": 0
     },
+    "fixed-containers": {
+      "baseline": "2024-09-19",
+      "port-version": 0
+    },
     "fixed-string": {
       "baseline": "0.1.1",
       "port-version": 0
diff --git a/versions/f-/fixed-containers.json b/versions/f-/fixed-containers.json
new file mode 100644
index 0000000000..df4de26c66
--- /dev/null
+++ b/versions/f-/fixed-containers.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "df7eaca532d35f09faf63721a245c1fccafddc29",
+      "version-date": "2024-09-19",
+      "port-version": 0
+    }
+  ]
+}