diff --git a/ports/fplus/portfile.cmake b/ports/fplus/portfile.cmake
deleted file mode 100644
index a8bc497e48..0000000000
--- a/ports/fplus/portfile.cmake
+++ /dev/null
@@ -1,20 +0,0 @@
-vcpkg_from_github(
-    OUT_SOURCE_PATH SOURCE_PATH
-    REPO Dobiasd/FunctionalPlus
-    REF "v${VERSION}"
-    SHA512 025216c9b054b581d2be2c6bf3a9ebf906cce436875d3f7246fdd85f06fe0f29ece9b4dbe3f25228cd329cce36e95aa73fc406fb1bbdd0ee1a6bc30bf95ecf76
-    HEAD_REF master
-)
-
-vcpkg_cmake_configure(
-    SOURCE_PATH "${SOURCE_PATH}"
-    OPTIONS
-        -DFunctionalPlus_INSTALL_CMAKEDIR=share/FunctionalPlus
-)
-
-vcpkg_cmake_install()
-
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug")
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib")
-
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/ports/fplus/vcpkg.json b/ports/fplus/vcpkg.json
deleted file mode 100644
index d981033ed1..0000000000
--- a/ports/fplus/vcpkg.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "name": "fplus",
-  "version": "0.2.23",
-  "description": "Functional Programming Library for C++. Write concise and readable C++ code",
-  "homepage": "https://github.com/Dobiasd/FunctionalPlus",
-  "license": "BSL-1.0",
-  "dependencies": [
-    {
-      "name": "vcpkg-cmake",
-      "host": true
-    }
-  ]
-}
diff --git a/ports/frugally-deep/vcpkg.json b/ports/frugally-deep/vcpkg.json
index e9e698c8a0..ee7e683fe2 100644
--- a/ports/frugally-deep/vcpkg.json
+++ b/ports/frugally-deep/vcpkg.json
@@ -1,12 +1,13 @@
 {
   "name": "frugally-deep",
   "version-semver": "0.15.31",
+  "port-version": 1,
   "description": "Header-only library for using Keras models in C++.",
   "homepage": "https://github.com/Dobiasd/frugally-deep",
   "license": "MIT",
   "dependencies": [
     "eigen3",
-    "fplus",
+    "functionalplus",
     "nlohmann-json",
     {
       "name": "vcpkg-cmake",
diff --git a/ports/functionalplus/portfile.cmake b/ports/functionalplus/portfile.cmake
new file mode 100644
index 0000000000..496d5921b6
--- /dev/null
+++ b/ports/functionalplus/portfile.cmake
@@ -0,0 +1,19 @@
+set(VCPKG_BUILD_TYPE release)  # header-only
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO Dobiasd/FunctionalPlus
+    REF "v${VERSION}"
+    SHA512 7b3e451af977ef52a112ad59a4b1f4dc64b120348acb80b751a01bc56d986358b6237d461fe0cf91431b6bc49bc823f8b4ac0016ede9a9e85561cf278d00bb41
+    HEAD_REF master
+)
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        -DFunctionalPlus_INSTALL_CMAKEDIR=share/functionalplus
+)
+
+vcpkg_cmake_install()
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/ports/functionalplus/vcpkg.json b/ports/functionalplus/vcpkg.json
new file mode 100644
index 0000000000..1dcb415d95
--- /dev/null
+++ b/ports/functionalplus/vcpkg.json
@@ -0,0 +1,13 @@
+{
+  "name": "functionalplus",
+  "version": "0.2.24",
+  "description": "This port is the new fplus port, the old fplus has been removed. Functional Programming Library for C++. Write concise and readable C++ code",
+  "homepage": "https://github.com/Dobiasd/FunctionalPlus",
+  "license": "BSL-1.0",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    }
+  ]
+}
diff --git a/versions/baseline.json b/versions/baseline.json
index 3a84db8802..44f847d148 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -2816,10 +2816,6 @@
       "baseline": "2021-02-21",
       "port-version": 2
     },
-    "fplus": {
-      "baseline": "0.2.23",
-      "port-version": 0
-    },
     "freealut": {
       "baseline": "1.1.0",
       "port-version": 4
@@ -2866,7 +2862,7 @@
     },
     "frugally-deep": {
       "baseline": "0.15.31",
-      "port-version": 0
+      "port-version": 1
     },
     "fruit": {
       "baseline": "3.7.1",
@@ -2884,6 +2880,10 @@
       "baseline": "4.2.4",
       "port-version": 0
     },
+    "functionalplus": {
+      "baseline": "0.2.24",
+      "port-version": 0
+    },
     "functions-framework-cpp": {
       "baseline": "1.2.0",
       "port-version": 0
diff --git a/versions/f-/frugally-deep.json b/versions/f-/frugally-deep.json
index ee5e4816e5..5a7b5984b7 100644
--- a/versions/f-/frugally-deep.json
+++ b/versions/f-/frugally-deep.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "d924a5757d3a38c1e6583282ed57a9ac3ff51145",
+      "version-semver": "0.15.31",
+      "port-version": 1
+    },
     {
       "git-tree": "df2995d023174c6daf1fae111a4140ecdf151bce",
       "version-semver": "0.15.31",
diff --git a/versions/f-/functionalplus.json b/versions/f-/functionalplus.json
new file mode 100644
index 0000000000..1b33538b3e
--- /dev/null
+++ b/versions/f-/functionalplus.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "b7b848450c56319f9bb6eed3239126417ea3bbc8",
+      "version": "0.2.24",
+      "port-version": 0
+    }
+  ]
+}