diff --git a/.github/readme.md b/.github/readme.md
index 1debf02f7..7ffad2203 100644
--- a/.github/readme.md
+++ b/.github/readme.md
@@ -26,8 +26,7 @@ If you want to contribute as a developer, please contact us in the [Discord](htt
 
 ## License
 
-RPCSX is licensed under GPLv2 license except directories containing their own LICENSE file, or files containing their own license.
-Thus, orbis-kernel is licensed under the MIT license.
+RPCSX is licensed under GPLv2-or-later license except directories containing their own LICENSE file, or files containing their own license.
 
 ## RPCS3
 
diff --git a/.gitmodules b/.gitmodules
index 38063ff4d..ad40ffbd2 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -140,3 +140,9 @@
 [submodule "3rdparty/glfw"]
 	path = 3rdparty/glfw
 	url = ../../glfw/glfw.git
+[submodule "3rdparty/xed"]
+	path = 3rdparty/xed
+	url = https://github.com/intelxed/xed.git
+[submodule "3rdparty/mbuild"]
+	path = 3rdparty/mbuild
+	url = https://github.com/intelxed/mbuild.git
diff --git a/3rdparty/CMakeLists.txt b/3rdparty/CMakeLists.txt
index 67174c58e..4c9e51488 100644
--- a/3rdparty/CMakeLists.txt
+++ b/3rdparty/CMakeLists.txt
@@ -457,6 +457,27 @@ else()
 	add_library(3rdparty::glfw ALIAS glfw)
 endif()
 
+find_package(Python3 REQUIRED COMPONENTS Interpreter)
+
+set(XED_SRC_PATH ${CMAKE_CURRENT_SOURCE_DIR}/xed) 
+set(XED_BIN_PATH ${CMAKE_CURRENT_BINARY_DIR}/xed)
+make_directory(${XED_BIN_PATH}/obj)
+
+if (${CMAKE_CROSSCOMPILING})
+	set(XED_FLAGS --extra-flags="--target=${CMAKE_C_COMPILER_TARGET}" --extra-linkflags="--target=${CMAKE_C_COMPILER_TARGET}")
+endif()
+
+add_custom_command(
+	OUTPUT "${XED_BIN_PATH}/obj/libxed.a"
+	COMMAND "${Python3_EXECUTABLE}" "${XED_SRC_PATH}/mfile.py" "--cc=${CMAKE_C_COMPILER}" "--cxx=${CMAKE_CXX_COMPILER}" "--linker=${CMAKE_CXX_COMPILER}" ${XED_FLAGS}
+	COMMENT "Building xed..."
+	WORKING_DIRECTORY ${XED_BIN_PATH}
+)
+add_custom_target(xed-build DEPENDS "${XED_BIN_PATH}/obj/libxed.a")
+add_library(xed STATIC IMPORTED GLOBAL)
+set_property(TARGET xed PROPERTY IMPORTED_LOCATION "${XED_BIN_PATH}/obj/libxed.a")
+set_property(TARGET xed PROPERTY INTERFACE_INCLUDE_DIRECTORIES "${XED_SRC_PATH}/include/public/xed/" "${XED_BIN_PATH}/obj")
+add_dependencies(xed xed-build)
 
 add_library(3rdparty::zlib ALIAS 3rdparty_zlib)
 add_library(3rdparty::zstd ALIAS 3rdparty_zstd)
diff --git a/3rdparty/mbuild b/3rdparty/mbuild
new file mode 160000
index 000000000..c40618acd
--- /dev/null
+++ b/3rdparty/mbuild
@@ -0,0 +1 @@
+Subproject commit c40618acd549e6ae2569a84eaf0407f64dc7b6b2
diff --git a/3rdparty/xed b/3rdparty/xed
new file mode 160000
index 000000000..95ca7183f
--- /dev/null
+++ b/3rdparty/xed
@@ -0,0 +1 @@
+Subproject commit 95ca7183f6e27834f9bfad7095eefa057f09a88b