diff --git a/ports/botan/0009-fix-regression-f2bf049-85491b3.patch b/ports/botan/0009-fix-regression-f2bf049-85491b3.patch
new file mode 100644
index 0000000000..27d58f88d9
--- /dev/null
+++ b/ports/botan/0009-fix-regression-f2bf049-85491b3.patch
@@ -0,0 +1,39 @@
+diff --git a/configure.py b/configure.py
+index be0dc23..27f48b8 100644
+--- a/configure.py
++++ b/configure.py
+@@ -2322,6 +2322,8 @@ def create_template_vars(source_paths, build_paths, options, modules, disabled_m
+         # just transfer them over to just the compiler invocations
+         variables['cc_compile_flags'] = '%s %s' % (variables['cxx_abi_flags'], variables['cc_compile_flags'])
+         variables['cxx_abi_flags'] = ''
++    else:
++        variables['ldflags'] = '%s %s' % (variables['ldflags'], variables['cc_compile_flags'])
+ 
+     variables['lib_flags'] = cc.gen_lib_flags(options, variables)
+ 
+diff --git a/src/build-data/makefile.in b/src/build-data/makefile.in
+index 7696aa7..4dbf192 100644
+--- a/src/build-data/makefile.in
++++ b/src/build-data/makefile.in
+@@ -16,7 +16,7 @@ LANG_EXE_FLAGS = %{cc_lang_binary_linker_flags}
+ CXXFLAGS       = %{cc_compile_flags}
+ WARN_FLAGS     = %{cc_warning_flags}
+ LIB_FLAGS      = %{lib_flags}
+-LDFLAGS        = %{ldflags} %{cc_compile_flags}
++LDFLAGS        = %{ldflags}
+ 
+ EXE_LINK_CMD   = %{exe_link_cmd}
+ 
+diff --git a/src/build-data/ninja.in b/src/build-data/ninja.in
+index a6279d3..414663a 100644
+--- a/src/build-data/ninja.in
++++ b/src/build-data/ninja.in
+@@ -10,7 +10,7 @@ LANG_EXE_FLAGS = %{cc_lang_binary_linker_flags}
+ CXXFLAGS       = %{cc_compile_flags}
+ WARN_FLAGS     = %{cc_warning_flags}
+ 
+-LDFLAGS        = %{ldflags} %{cc_compile_flags}
++LDFLAGS        = %{ldflags}
+ 
+ EXE_LINK_CMD   = %{exe_link_cmd}
+ 
diff --git a/ports/botan/add-include-string.patch b/ports/botan/add-include-string.patch
deleted file mode 100644
index 4949ba5e6a..0000000000
--- a/ports/botan/add-include-string.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/src/lib/math/pcurves/pcurves_id.h b/src/lib/math/pcurves/pcurves_id.h
-index 915dd95..3d39666 100644
---- a/src/lib/math/pcurves/pcurves_id.h
-+++ b/src/lib/math/pcurves/pcurves_id.h
-@@ -10,6 +10,7 @@
- #include <botan/secmem.h>
- #include <botan/types.h>
- #include <optional>
-+#include <string>
- #include <string_view>
- #include <vector>
- 
diff --git a/ports/botan/embed-debug-info.patch b/ports/botan/embed-debug-info.patch
index 840f6e7326..14d2a5ca4a 100644
--- a/ports/botan/embed-debug-info.patch
+++ b/ports/botan/embed-debug-info.patch
@@ -2,7 +2,7 @@ diff --git a/src/build-data/cc/msvc.txt b/src/build-data/cc/msvc.txt
 index 64b6eae..66258ca 100644
 --- a/src/build-data/cc/msvc.txt
 +++ b/src/build-data/cc/msvc.txt
-@@ -20,10 +20,10 @@ optimization_flags "/O2 /Oi"
+@@ -20,10 +20,10 @@ optimization_flags "/O2 /Oi /Zc:throwingNew"
  size_optimization_flags "/O1 /Os"
  
  # for debug info in the object file (required if using sccache):
@@ -13,5 +13,5 @@ index 64b6eae..66258ca 100644
 -debug_info_flags "/Zi /FS"
 +#debug_info_flags "/Zi /FS"
  
- preproc_flags "/nologo /EP"
+ preproc_flags "/nologo /EP /Zc:preprocessor"
  
diff --git a/ports/botan/portfile.cmake b/ports/botan/portfile.cmake
index e3562ee4da..9f70d1d001 100644
--- a/ports/botan/portfile.cmake
+++ b/ports/botan/portfile.cmake
@@ -2,7 +2,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO randombit/botan
     REF "${VERSION}"
-    SHA512 5b5766d279d92659fd8e6d5d5aac8be7328a8eae7412085c96e7059ecc560f596bf55ff0a8df6d671de5169d2a80694a6bdd6561dbe9bbb4c3df56b687c50039
+    SHA512 dcd9ac8e748422d55854c38e565704e4a239418b6855836bdea85bd4dc3ab45e218d320471b98b6a451fc63d8518895f3813a50c94dee90227c09d12d96ca1dc
     HEAD_REF master
     PATCHES
         embed-debug-info.patch
@@ -12,7 +12,7 @@ vcpkg_from_github(
         fix_android.patch
         libcxx-winpthread-fixes.patch
         fix-cmake-usage.patch
-        add-include-string.patch
+        0009-fix-regression-f2bf049-85491b3.patch # extract from PR 4255
 )
 file(COPY "${CMAKE_CURRENT_LIST_DIR}/configure" DESTINATION "${SOURCE_PATH}")
 
diff --git a/ports/botan/vcpkg.json b/ports/botan/vcpkg.json
index 52b945dda6..e36048d8e2 100644
--- a/ports/botan/vcpkg.json
+++ b/ports/botan/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "botan",
-  "version": "3.5.0",
-  "port-version": 1,
+  "version": "3.6.1",
   "description": "A cryptography library written in C++11",
   "homepage": "https://botan.randombit.net",
   "license": "BSD-2-Clause",
diff --git a/versions/b-/botan.json b/versions/b-/botan.json
index b249d4929d..00d2609665 100644
--- a/versions/b-/botan.json
+++ b/versions/b-/botan.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "eb6faea666501a265f3603c014bdee929c0174c3",
+      "version": "3.6.1",
+      "port-version": 0
+    },
     {
       "git-tree": "827a8fc1dd4c4f2b998824ba4c9dae41a47afa98",
       "version": "3.5.0",
diff --git a/versions/baseline.json b/versions/baseline.json
index 8ccee92bbf..17a1fb06ab 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -1377,8 +1377,8 @@
       "port-version": 0
     },
     "botan": {
-      "baseline": "3.5.0",
-      "port-version": 1
+      "baseline": "3.6.1",
+      "port-version": 0
     },
     "box2d": {
       "baseline": "2.4.1",