diff --git a/CMakeLists.txt b/CMakeLists.txt
index a6d2af39f..fd364cf56 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -34,7 +34,7 @@ add_subdirectory(ext/tug EXCLUDE_FROM_ALL)
 add_subdirectory(ext/iphreeqc EXCLUDE_FROM_ALL)
 
 # AI/NAA specific includes TODO: add option flags
-add_subdirectory(ext/ai-surrogate EXCLUDE_FROM_ALL)
+add_subdirectory(ext/ai-surrogate-poet EXCLUDE_FROM_ALL)
 
 
 
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 1727685f1..37fe5b408 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -89,9 +89,9 @@ file(READ "${PROJECT_SOURCE_DIR}/R_lib/init_r_lib.R" R_INIT_LIB)
 file(READ "${PROJECT_SOURCE_DIR}/R_lib/ai_surrogate_model.R" R_AI_SURROGATE_LIB)
 
 configure_file(poet.hpp.in poet.hpp @ONLY)
-
+include_directories("${CMAKE_SOURCE_DIR}/ext/ai-surrogate-poet/include")
 add_executable(poet poet.cpp)
-target_link_libraries(poet PRIVATE POETLib MPI::MPI_C RRuntime CLI11::CLI11)
+target_link_libraries(poet PRIVATE POETLib MPI::MPI_C RRuntime CLI11::CLI11 ai naaice::middleware)
 target_include_directories(poet PRIVATE "${CMAKE_CURRENT_BINARY_DIR}")
 
 add_executable(poet_init initializer.cpp)