diff --git a/README.md b/README.md
index 615cbf11..3be08810 100644
--- a/README.md
+++ b/README.md
@@ -76,7 +76,7 @@ Windows build is not ready yet.
 
 ## Dependencies
 
-This library is written in C++ using the C++11 standards. It also uses Flex
+This library is written in C++ using the C++17 standards. It also uses Flex
 and Yacc to produce the “Sec Rules Language” parser. Other, mandatory dependencies include YAJL, as ModSecurity uses JSON for producing logs and its testing framework, libpcre (not yet mandatory) for processing regular expressions in SecRules, and libXML2 (not yet mandatory) which is used for parsing XML requests.
 
 All others dependencies are related to operators specified within SecRules or configuration directives and may not be required for compilation. A short list of such dependencies is as follows:
diff --git a/configure.ac b/configure.ac
index 32570456..d8636036 100644
--- a/configure.ac
+++ b/configure.ac
@@ -52,8 +52,8 @@ AC_PROG_MAKE_SET
 PKG_PROG_PKG_CONFIG
 
 
-# Check if the compiler is c++11 compatible.
-# AX_CXX_COMPILE_STDCXX_11(,mandatory)
+# Check if the compiler is c++17 compatible.
+# AX_CXX_COMPILE_STDCXX_17(,mandatory)
 
 # Check for libinjection
 if ! test -f "${srcdir}/others/libinjection/src/libinjection_html5.c"; then
diff --git a/examples/reading_logs_via_rule_message/Makefile.am b/examples/reading_logs_via_rule_message/Makefile.am
index 797ac752..cab135bc 100644
--- a/examples/reading_logs_via_rule_message/Makefile.am
+++ b/examples/reading_logs_via_rule_message/Makefile.am
@@ -32,7 +32,7 @@ simple_request_LDFLAGS = \
 
 simple_request_CPPFLAGS = \
 	$(GLOBAL_CFLAGS) \
-	-std=c++11 \
+	-std=c++17 \
 	-I$(top_builddir)/headers \
 	-I$(top_builddir) \
 	-g \
diff --git a/examples/reading_logs_with_offset/Makefile.am b/examples/reading_logs_with_offset/Makefile.am
index b798c8c5..33c8959d 100644
--- a/examples/reading_logs_with_offset/Makefile.am
+++ b/examples/reading_logs_with_offset/Makefile.am
@@ -32,7 +32,7 @@ read_LDFLAGS = \
 
 read_CPPFLAGS = \
 	$(GLOBAL_CFLAGS) \
-	-std=c++11 \
+	-std=c++17 \
 	-I$(top_builddir)/headers \
 	-I$(top_builddir) \
 	-g \
diff --git a/examples/using_bodies_in_chunks/Makefile.am b/examples/using_bodies_in_chunks/Makefile.am
index 799efe78..72f7bd22 100644
--- a/examples/using_bodies_in_chunks/Makefile.am
+++ b/examples/using_bodies_in_chunks/Makefile.am
@@ -33,7 +33,7 @@ simple_request_LDFLAGS = \
 
 simple_request_CPPFLAGS = \
 	$(GLOBAL_CFLAGS) \
-	-std=c++11 \
+	-std=c++17 \
 	-I$(top_builddir)/headers \
 	-I$(top_builddir) \
 	-g \
diff --git a/src/Makefile.am b/src/Makefile.am
index 5078c4c0..39c9dc32 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -311,7 +311,7 @@ libmodsecurity_la_CFLAGS =
 
 
 libmodsecurity_la_CPPFLAGS = \
-	-std=c++11 \
+	-std=c++17 \
 	-I.. \
 	-g \
 	-I../others \
diff --git a/src/parser/Makefile.am b/src/parser/Makefile.am
index c5605d67..1fc57310 100644
--- a/src/parser/Makefile.am
+++ b/src/parser/Makefile.am
@@ -11,11 +11,10 @@ libmodsec_parser_la_SOURCES = \
 	test.cc
 
 libmodsec_parser_la_CPPFLAGS = \
-	-std=c++11 \
+	-std=c++17 \
 	-I../.. \
 	-I../../headers \
 	-I../../others \
-	-std=c++11 \
 	-I.. \
 	-g \
 	-fPIC \
diff --git a/test/Makefile.am b/test/Makefile.am
index 9237a874..753e3a38 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -70,7 +70,7 @@ unit_tests_LDFLAGS = \
 
 
 unit_tests_CPPFLAGS = \
-	-std=c++11 \
+	-std=c++17 \
 	-Icommon \
 	-I../ \
 	-g \
@@ -126,7 +126,7 @@ regression_tests_LDFLAGS = \
 
 
 regression_tests_CPPFLAGS = \
-	-std=c++11 \
+	-std=c++17 \
 	-Icommon \
 	-I../ \
 	-g \
@@ -179,7 +179,7 @@ rules_optimization_LDFLAGS = \
 	$(YAJL_LDFLAGS)
 
 rules_optimization_CPPFLAGS = \
-	-std=c++11 \
+	-std=c++17 \
 	-Icommon \
 	-I../ \
 	-g \
diff --git a/test/benchmark/Makefile.am b/test/benchmark/Makefile.am
index 73a975b3..865818ca 100644
--- a/test/benchmark/Makefile.am
+++ b/test/benchmark/Makefile.am
@@ -32,7 +32,7 @@ benchmark_LDFLAGS = \
 	$(LUA_LDFLAGS)
 
 benchmark_CPPFLAGS = \
-	-std=c++11 \
+	-std=c++17 \
 	-I$(top_builddir)/headers \
 	$(GLOBAL_CPPFLAGS) \
 	$(PCRE_CFLAGS) \
diff --git a/test/fuzzer/Makefile.am b/test/fuzzer/Makefile.am
index d1fd08dc..dc1b1e50 100644
--- a/test/fuzzer/Makefile.am
+++ b/test/fuzzer/Makefile.am
@@ -30,7 +30,7 @@ afl_fuzzer_LDADD = \
 
 
 afl_fuzzer_CPPFLAGS = \
-	-std=c++11 \
+	-std=c++17 \
 	-Icommon \
 	-I../ \
 	-I../../ \
diff --git a/tools/rules-check/Makefile.am b/tools/rules-check/Makefile.am
index 615d9598..bd929383 100644
--- a/tools/rules-check/Makefile.am
+++ b/tools/rules-check/Makefile.am
@@ -28,7 +28,7 @@ modsec_rules_check_LDFLAGS = \
 	$(YAJL_LDFLAGS)
 
 modsec_rules_check_CPPFLAGS = \
-	-std=c++11 \
+	-std=c++17 \
 	-I$(top_builddir)/headers \
 	$(GLOBAL_CPPFLAGS) \
 	$(PCRE_CFLAGS) \