diff --git a/ports/3fd/CONTROL b/ports/3fd/CONTROL
index 32e1e5d071..6f278f762d 100644
--- a/ports/3fd/CONTROL
+++ b/ports/3fd/CONTROL
@@ -1,4 +1,4 @@
 Source: 3fd
-Version: 2.6.2-1
+Version: 2.6.2-2
 Description: C++ Framework For Fast Development
 Build-Depends: boost-lockfree (windows), boost-regex (windows), poco (windows), sqlite3, rapidxml
diff --git a/ports/3fd/RapidXML.patch b/ports/3fd/RapidXML.patch
new file mode 100644
index 0000000000..fdb6cd18eb
--- /dev/null
+++ b/ports/3fd/RapidXML.patch
@@ -0,0 +1,13 @@
+diff --git a/3FD/configuration.cpp b/3FD/configuration.cpp
+index b9ca804..207a397 100644
+--- a/3FD/configuration.cpp
++++ b/3FD/configuration.cpp
+@@ -2,7 +2,7 @@
+ #include "configuration.h"
+ #include "exceptions.h"
+ #include "utils_io.h"
+-#include <rapidxml.hpp>
++#include <rapidxml/rapidxml.hpp>
+ 
+ #ifdef _3FD_PLATFORM_WINRT
+ #    include "utils_winrt.h"
diff --git a/ports/3fd/portfile.cmake b/ports/3fd/portfile.cmake
index 513bb9a03a..1e7e9d6016 100644
--- a/ports/3fd/portfile.cmake
+++ b/ports/3fd/portfile.cmake
@@ -32,6 +32,7 @@ vcpkg_from_github(
     PATCHES
         "${CMAKE_CURRENT_LIST_DIR}/remove-seekpos.patch"
         "${CMAKE_CURRENT_LIST_DIR}/DataException.patch"
+        "${CMAKE_CURRENT_LIST_DIR}/RapidXML.patch"
 )
 
 # Copy the sources to ensure a clean, out-of-source build
diff --git a/ports/rapidxml-ns/CONTROL b/ports/rapidxml-ns/CONTROL
new file mode 100644
index 0000000000..1dd1ed5469
--- /dev/null
+++ b/ports/rapidxml-ns/CONTROL
@@ -0,0 +1,3 @@
+Source: rapidxml-ns
+Version: 1.13-04674e3
+Description: RapidXML with added XML namespaces support.
diff --git a/ports/rapidxml-ns/portfile.cmake b/ports/rapidxml-ns/portfile.cmake
new file mode 100644
index 0000000000..c38d6c4ec3
--- /dev/null
+++ b/ports/rapidxml-ns/portfile.cmake
@@ -0,0 +1,22 @@
+#header-only library
+include(vcpkg_common_functions)
+
+vcpkg_from_github(
+  OUT_SOURCE_PATH SOURCE_PATH
+  REPO svgpp/rapidxml_ns
+  REF 04674e33e3bbfeee05875a29a36734667c0f3cfd
+  SHA512 c82d55ca7ec358427f811689604ba02582de9d7f57d0caa3a96e2c36b9f3751e9acefc6f84348e6c619dacca31880f279bf9d9959f8eff251f3d3276c836bcd2
+  HEAD_REF master
+)
+
+# Handle copyright
+file(COPY ${SOURCE_PATH}/license.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/rapidxml-ns)
+file(RENAME ${CURRENT_PACKAGES_DIR}/share/rapidxml-ns/license.txt ${CURRENT_PACKAGES_DIR}/share/rapidxml-ns/copyright)
+
+# Copy the header files
+file(INSTALL 
+	     ${SOURCE_PATH}/rapidxml_ns.hpp
+	     ${SOURCE_PATH}/rapidxml_ns_print.hpp
+	     ${SOURCE_PATH}/rapidxml_ns_utils.hpp
+	 DESTINATION 
+	     ${CURRENT_PACKAGES_DIR}/include/rapidxml-ns)
diff --git a/ports/rapidxml/portfile.cmake b/ports/rapidxml/portfile.cmake
index a5f3190d08..dd8f0d4c2f 100644
--- a/ports/rapidxml/portfile.cmake
+++ b/ports/rapidxml/portfile.cmake
@@ -13,4 +13,4 @@ file(COPY ${SOURCE_PATH}/license.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/r
 file(RENAME ${CURRENT_PACKAGES_DIR}/share/rapidxml/license.txt ${CURRENT_PACKAGES_DIR}/share/rapidxml/copyright)
 
 # Copy the header files
-file(INSTALL ${SOURCE_PATH}/ DESTINATION ${CURRENT_PACKAGES_DIR}/include FILES_MATCHING PATTERN "*.hpp")
+file(INSTALL ${SOURCE_PATH}/ DESTINATION ${CURRENT_PACKAGES_DIR}/include/rapidxml FILES_MATCHING PATTERN "*.hpp")