diff --git a/.gitmodules b/.gitmodules
index 00d3b0982a1..7aed8dc3ace 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -7,3 +7,6 @@
 [submodule "src/runtime_src/core/common/gsl"]
 	path = src/runtime_src/core/common/gsl
 	url = https://github.com/microsoft/GSL.git
+[submodule "src/runtime_src/core/common/aiebu"]
+	path = src/runtime_src/core/common/aiebu
+	url = https://github.com/Xilinx/aiebu.git
diff --git a/src/runtime_src/core/common/CMakeLists.txt b/src/runtime_src/core/common/CMakeLists.txt
index bc25b08dcf8..2f9508b44ee 100644
--- a/src/runtime_src/core/common/CMakeLists.txt
+++ b/src/runtime_src/core/common/CMakeLists.txt
@@ -4,6 +4,14 @@
 add_subdirectory(api)
 add_subdirectory(xdp)
 
+if(CMAKE_VERSION VERSION_LESS "3.18.0")
+  message(WARNING "CMake version is less than 3.18.0, build of submodule aiebu disabled")
+elseif(DEFINED XRT_AIE_BUILD)
+  message(WARNING "Edge Versal device, build of submodule aiebu disabled")
+else()
+  add_subdirectory(aiebu)
+endif()
+
 add_library(core_common_library_objects OBJECT
   config_reader.cpp
   debug.cpp
diff --git a/src/runtime_src/core/common/aiebu b/src/runtime_src/core/common/aiebu
new file mode 160000
index 00000000000..2a8ad762e85
--- /dev/null
+++ b/src/runtime_src/core/common/aiebu
@@ -0,0 +1 @@
+Subproject commit 2a8ad762e85275036316f5a30ecf0bc8e3c633a8