diff --git a/Makefile.bsd b/Makefile.bsd
index be137bc5..1e5b09ae 100644
--- a/Makefile.bsd
+++ b/Makefile.bsd
@@ -14,9 +14,9 @@ LDLIBS = -lssl -lcrypto -lz -lpthread -lboost_program_options -lboost_json
 CXXVER := $(shell $(CXX) -dumpversion|cut -c 1-2)
 ifeq (${CXXVER}, "4.") # older clang always returned 4.2.1
 	$(error Compiler too old)
-else ifeq (${CXXVER}, ${filter ${CXXVER},16 17 18 19})  # clang 16 - 19
-	NEEDED_CXXFLAGS = -std=c++20
+else ifeq (${CXXVER}, ${filter ${CXXVER},20 21 22 23})  # clang 20 - 23
+	NEEDED_CXXFLAGS = -std=c++23
 else
-	NEEDED_CXXFLAGS = -std=c++17
+	NEEDED_CXXFLAGS = -std=c++20
 endif
 
diff --git a/Makefile.linux b/Makefile.linux
index 4154d0cc..aee50f0e 100644
--- a/Makefile.linux
+++ b/Makefile.linux
@@ -19,8 +19,7 @@ endif
 else ifeq ($(shell expr match ${CXXVER} "11"),2) # gcc 11
 	NEEDED_CXXFLAGS += -std=c++20
 else ifeq ($(shell expr match ${CXXVER} "12"),2) # gcc 12
-# for Debian 12 with boost 1.74
-	NEEDED_CXXFLAGS += -std=c++17 -Wno-bidi-chars
+	NEEDED_CXXFLAGS += -std=c++20 -Wno-bidi-chars
 else ifeq ($(shell expr match ${CXXVER} "1[3-9]"),2) # gcc 13+
 	NEEDED_CXXFLAGS += -std=c++23 -Wno-bidi-chars
 ifeq ($(TORRENTS),yes)