diff --git a/CMakeLists.txt b/CMakeLists.txt
index ebdb4f9..e72fee8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -41,7 +41,9 @@ include_directories(SYSTEM ${Boost_INCLUDE_DIRS})
 
 
 message(STATUS "PQXX_VERSION=${PQXX_VERSION}")
-if (PQXX_VERSION VERSION_GREATER_EQUAL "7.0.0")
+if (PQXX_VERSION VERSION_GREATER_EQUAL "8.0.0")
+  set(CMAKE_CXX_STANDARD 20)
+elseif (PQXX_VERSION VERSION_GREATER_EQUAL "7.0.0")
   set(CMAKE_CXX_STANDARD 17)
 else()
   add_definitions(-DPQXX_DISCONNECT)