diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 00000000..258e09fa
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,4 @@
+[submodule "aie-codegen"]
+	path = aie-codegen
+	url = https://github.com/Xilinx/aie-codegen.git
+	branch = main
diff --git a/aie-codegen b/aie-codegen
new file mode 160000
index 00000000..407d73ef
--- /dev/null
+++ b/aie-codegen
@@ -0,0 +1 @@
+Subproject commit 407d73efc4266b2bf62d0131aa14d528b75c7e9b
diff --git a/profile/CMakeLists.txt b/profile/CMakeLists.txt
index 2a1c4965..56e3990a 100644
--- a/profile/CMakeLists.txt
+++ b/profile/CMakeLists.txt
@@ -52,5 +52,19 @@ install(TARGETS xdp_core
   RUNTIME DESTINATION ${XRT_INSTALL_BIN_DIR} COMPONENT ${XRT_COMPONENT}
   LIBRARY DESTINATION ${XRT_INSTALL_LIB_DIR} COMPONENT ${XRT_COMPONENT} NAMELINK_SKIP)
 
+# Build aie_codegen + fal for XDP consumers only
+if (XDP_CLIENT_BUILD_CMAKE STREQUAL "yes" OR XDP_VE2_BUILD_CMAKE STREQUAL "yes")
+  set(AIE_CODEGEN_DIR ${CMAKE_CURRENT_BINARY_DIR}/../aie-codegen/src)
+  set(AIE_CODEGEN_BUILD_SHARED OFF CACHE BOOL "" FORCE)
+
+  xrt_add_subdirectory_disable_install_target(../aie-codegen/src ${CMAKE_CURRENT_BINARY_DIR}/../aie-codegen/src)
+
+  if (XDP_VE2_BUILD_CMAKE STREQUAL "yes")
+    set(AIEBU_SOURCE_DIR ${XRT_SOURCE_DIR}/runtime_src/core/common/aiebu)
+    xrt_add_subdirectory_disable_install_target(../aie-codegen/fal ${CMAKE_CURRENT_BINARY_DIR}/../aie-codegen/fal)
+    set(AIEFAL_DIR ${CMAKE_CURRENT_BINARY_DIR}/../aie-codegen/fal/src/include)
+  endif()
+endif()
+
 # Build the individual plugins
 add_subdirectory(plugin)