diff --git a/.gitmodules b/.gitmodules
index d20f33113e..0bd5614cad 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -18,3 +18,7 @@
 	path = mods/silo
 	url = https://git.kindred-systems.com/kindred/silo-mod.git
 	branch = main
+[submodule "mods/solver"]
+	path = mods/solver
+	url = https://git.kindred-systems.com/kindred/solver.git
+	branch = main
diff --git a/mods/solver b/mods/solver
new file mode 160000
index 0000000000..98051ba0c9
--- /dev/null
+++ b/mods/solver
@@ -0,0 +1 @@
+Subproject commit 98051ba0c9df0438f22d8b5bbcfc51b105909886
diff --git a/src/Mod/Create/CMakeLists.txt b/src/Mod/Create/CMakeLists.txt
index f21c9ba832..ec342f8702 100644
--- a/src/Mod/Create/CMakeLists.txt
+++ b/src/Mod/Create/CMakeLists.txt
@@ -84,3 +84,18 @@ install(
     DESTINATION
         mods/sdk
 )
+
+# Install Kindred Solver addon
+install(
+    DIRECTORY
+        ${CMAKE_SOURCE_DIR}/mods/solver/kindred_solver
+    DESTINATION
+        mods/solver
+)
+install(
+    FILES
+        ${CMAKE_SOURCE_DIR}/mods/solver/package.xml
+        ${CMAKE_SOURCE_DIR}/mods/solver/Init.py
+    DESTINATION
+        mods/solver
+)