diff --git a/3rdparty/CMakeLists.txt b/3rdparty/CMakeLists.txt
index f34a070d7c..68ee0facfa 100644
--- a/3rdparty/CMakeLists.txt
+++ b/3rdparty/CMakeLists.txt
@@ -108,7 +108,7 @@ endif()
 
 # OpenGL
 
-find_package(OpenGL REQUIRED)
+find_package(OpenGL REQUIRED OPTIONAL_COMPONENTS EGL)
 
 add_library(3rdparty_opengl INTERFACE)
 target_include_directories(3rdparty_opengl INTERFACE GL)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b0fe9829f4..a399501734 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -28,6 +28,7 @@ option(USE_SDL "Enables SDL input handler" OFF)
 option(USE_SYSTEM_SDL "Prefer system SDL instead of the builtin one" OFF)
 option(USE_SYSTEM_FFMPEG "Prefer system ffmpeg instead of the prebuild one" OFF)
 option(USE_SYSTEM_OPENAL "Prefer system OpenAL instead of the prebuild one" ON)
+option(USE_SYSTEM_CURL "Prefer system Curl instead of the prebuild one" ON)
 
 set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/buildfiles/cmake")
 
diff --git a/rpcs3/CMakeLists.txt b/rpcs3/CMakeLists.txt
index 88cb6e29f1..226a126f26 100644
--- a/rpcs3/CMakeLists.txt
+++ b/rpcs3/CMakeLists.txt
@@ -30,7 +30,6 @@ if(UNIX AND NOT APPLE)
     find_package(Wayland)
     if(WAYLAND_FOUND)
         add_definitions(-DHAVE_WAYLAND)
-        set(ADDITIONAL_LIBS ${ADDITIONAL_LIBS} "EGL")
     endif()
 endif()
 
diff --git a/rpcs3/Emu/CMakeLists.txt b/rpcs3/Emu/CMakeLists.txt
index 8933c2a884..a0c949ab91 100644
--- a/rpcs3/Emu/CMakeLists.txt
+++ b/rpcs3/Emu/CMakeLists.txt
@@ -626,3 +626,7 @@ endif()
 if(USE_PRECOMPILED_HEADERS)
     target_precompile_headers(rpcs3_emu PRIVATE "${PROJECT_SOURCE_DIR}/rpcs3/stdafx.h")
 endif()
+
+if(WAYLAND_FOUND)
+    target_link_libraries(rpcs3_emu PRIVATE OpenGL::EGL)
+endif()