diff --git a/CMakeLists.txt b/CMakeLists.txt
index b0921ff10..88005732e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -335,6 +335,10 @@ if(lite)
   set(domdec OFF)
 endif()
 
+if(abpo AND NOT MPI_Fortran_FOUND)
+  message(WARNING "MPI is required for ABPO")
+endif()
+
 if((NOT MPI_Fortran_FOUND) AND domdec)
   message(WARNING "MPI is required for DOMDEC; switching DOMDEC OFF")
   set(domdec OFF)
diff --git a/tool/cmake/prefx_keywords.cmake b/tool/cmake/prefx_keywords.cmake
index ade87d2df..09579cbbf 100644
--- a/tool/cmake/prefx_keywords.cmake
+++ b/tool/cmake/prefx_keywords.cmake
@@ -152,6 +152,10 @@ if(blade)
   list(APPEND keywords BLADE)
 endif()
 
+if(abpo)
+  list(APPEND keywords ABPO)
+endif()
+
 if(ensemble OR abpo)
   list(APPEND keywords ENSEMBLE)
 endif()