diff --git a/sys/unix/hints/include/compiler.370 b/sys/unix/hints/include/compiler.370
index 62486d3ad..5ef6f801e 100755
--- a/sys/unix/hints/include/compiler.370
+++ b/sys/unix/hints/include/compiler.370
@@ -26,6 +26,7 @@ CCFLAGS = -g
 # If these are set on entry, preparation for C++ compiles is affected.
 #    CPLUSPLUS_NEEDED = 1           C++ compile bits included
 #    CPLUSPLUS_NEED17 = 1           C++ -std=c++17 (at least)
+#    CPLUSPLUS_NEED20 = 1           C++ -std=c++20 (at least)
 #    CPLUSPLUS_NEED_DEPSUPPRESS = 1 C++ -Wno-deprecated-copy,
 #                                       -Wno-deprecated-declarations
 
@@ -149,6 +150,14 @@ else   # g++ version greater than or equal to 12? (no follows)
 CCXX=g++ -std=c++17
 endif  # g++ version greater than or equal to 12
 endif  # CPLUSPLUS_NEED17
+ifdef CPLUSPLUS_NEED20
+ifeq "$(GPPGTEQ9)" "1"
+CCXX=g++ -std=c++20
+else   # g++ version greater than or equal to 9? (no follows)
+CCXX=g++ -std=c++17
+endif  # g++ version greater than or equal to 9
+endif  # CPLUSPLUS_NEED20
+
 
 else   # g++ or clang++ ?
 
@@ -183,6 +192,11 @@ ifeq "$(CLANGPPGTEQ17)" "1"
 CCXX=clang++ -std=c++17
 endif  # clang++ greater than or equal to 17
 endif  # CPLUSPLUS_NEED17
+ifdef CPLUSPLUS_NEED20
+ifeq "$(CLANGPPGTEQ17)" "1"
+CCXX=clang++ -std=c++20
+endif  # clang++ greater than or equal to 17
+endif  # CPLUSPLUS_NEED20
 endif  # end of clang++-specific section
 CXX=$(CCXX)
 endif  # CPLUSPLUS_NEEDED
diff --git a/sys/unix/hints/include/multiw-2.370 b/sys/unix/hints/include/multiw-2.370
index 073cc9c20..c580063b6 100644
--- a/sys/unix/hints/include/multiw-2.370
+++ b/sys/unix/hints/include/multiw-2.370
@@ -163,7 +163,7 @@ ifndef CPLUSPLUS_NEEDED
 CPLUSPLUS_NEEDED = 1
 endif   # CPLUSPLUS_NEEDED
 ifdef WANT_WIN_QT6
-CPLUSPLUS_NEED17 = 1
+CPLUSPLUS_NEED20 = 1
 CPLUSPLUS_NEED_DEPSUPPRESS = 1
 endif   # WANT_WIN_QT6
 endif   # WANT_WIN_QT