diff --git a/CMakeLists.txt b/CMakeLists.txt
index 53fc5a5d5..809bed8a7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,7 +9,7 @@
 cmake_minimum_required(VERSION 3.4.3)
 project(DiscoPoP)
 
-set(CMAKE_CXX_STANDARD 14)
+set(CMAKE_CXX_STANDARD 17)
 
 if (POLICY CMP0077)
 	cmake_policy(SET CMP0077 NEW)
diff --git a/rtlib/CMakeLists.txt b/rtlib/CMakeLists.txt
index e3163137b..2d901e4d3 100644
--- a/rtlib/CMakeLists.txt
+++ b/rtlib/CMakeLists.txt
@@ -47,7 +47,7 @@ set(DiscoPoP_SOURCES
         )
 
 set(CMAKE_CXX_FLAGS
-        "-O2 -std=c++11 -pthread -fno-rtti -fPIE -fPIC -ffreestanding")
+        "-O2 -std=c++17 -pthread -fno-rtti -fPIE -fPIC -ffreestanding")
 
 # add_custom_target(DiscoPoP)