diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
index 04862cac1..7b63e5ead 100644
--- a/plugins/CMakeLists.txt
+++ b/plugins/CMakeLists.txt
@@ -2,8 +2,8 @@ SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}")
 SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}")
 SET(CMAKE_DEBUG_POSTFIX "")
 
-# Enable C++17
-SET(CMAKE_CXX_STANDARD 17)
+# Enable C++20
+SET(CMAKE_CXX_STANDARD 20)
 
 IF(LMMS_BUILD_APPLE AND CMAKE_CXX_COMPILER_ID MATCHES "Clang")
 	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")
diff --git a/plugins/VstBase/RemoteVstPlugin/CMakeLists.txt b/plugins/VstBase/RemoteVstPlugin/CMakeLists.txt
index 3f861e2d5..445d4f911 100644
--- a/plugins/VstBase/RemoteVstPlugin/CMakeLists.txt
+++ b/plugins/VstBase/RemoteVstPlugin/CMakeLists.txt
@@ -6,7 +6,7 @@ endif()
 
 project(RemoteVstPlugin 
 	LANGUAGES CXX)
-set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD 20)
 
 include(CheckCXXPreprocessor)
 include(CheckCXXSourceCompiles)
diff --git a/src/3rdparty/CMakeLists.txt b/src/3rdparty/CMakeLists.txt
index e5cb62527..a959e3c7b 100644
--- a/src/3rdparty/CMakeLists.txt
+++ b/src/3rdparty/CMakeLists.txt
@@ -15,7 +15,7 @@ ADD_SUBDIRECTORY(weakjack)
 add_library(ringbuffer OBJECT
 	ringbuffer/src/lib/ringbuffer.cpp
 )
-target_compile_features(ringbuffer PUBLIC cxx_std_17)
+target_compile_features(ringbuffer PUBLIC cxx_std_20)
 target_include_directories(ringbuffer PUBLIC
 	ringbuffer/include
 	"${CMAKE_CURRENT_BINARY_DIR}"
diff --git a/src/3rdparty/hiir/CMakeLists.txt b/src/3rdparty/hiir/CMakeLists.txt
index e954ff187..248322adb 100644
--- a/src/3rdparty/hiir/CMakeLists.txt
+++ b/src/3rdparty/hiir/CMakeLists.txt
@@ -1,3 +1,3 @@
 add_library(hiir INTERFACE)
 target_include_directories(hiir INTERFACE ${CMAKE_CURRENT_SOURCE_DIR})
-target_compile_features(hiir INTERFACE cxx_std_17)
+target_compile_features(hiir INTERFACE cxx_std_20)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 7645e49e3..c458a5cd2 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -9,8 +9,8 @@ SET(CMAKE_AUTOMOC ON)
 SET(CMAKE_AUTOUIC ON)
 SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
 
-# Enable C++17
-SET(CMAKE_CXX_STANDARD 17)
+# Enable C++20
+SET(CMAKE_CXX_STANDARD 20)
 
 IF(LMMS_BUILD_APPLE AND CMAKE_CXX_COMPILER_ID MATCHES "Clang")
 	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 625601a3e..7d7b499af 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -28,5 +28,5 @@ foreach(LMMS_TEST_SRC IN LISTS LMMS_TESTS)
 		${QT_QTTEST_LIBRARY}
 	)
 
-	target_compile_features(${LMMS_TEST_NAME} PRIVATE cxx_std_17)
+	target_compile_features(${LMMS_TEST_NAME} PRIVATE cxx_std_20)
 endforeach()