diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4a340db313..a6d82b0d65 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -873,16 +873,6 @@ if(NOT ANDROID)
 	add_definitions(-DHAVE_HIDAPI=1)
 endif()
 
-find_library(OPENSLES_LIBRARIES NAMES OpenSLES)
-find_path(OPENSLES_INCLUDE_DIR NAMES SLES/OpenSLES.h)
-
-if (OPENSLES_LIBRARIES AND OPENSLES_INCLUDE_DIR)
-	set(OPENSLES_FOUND 1)
-	add_definitions(-DHAVE_OPENSLES=1)
-	include_directories(${OPENSLES_INCLUDE_DIR})
-	message(STATUS "OpenSLES found, enabling OpenSLES sound backend")
-endif()
-
 if(NOT DISABLE_WX)
 	find_package(wxWidgets COMPONENTS core aui adv)
 
diff --git a/CMakeTests/FindOpenSLES.cmake b/CMakeTests/FindOpenSLES.cmake
new file mode 100644
index 0000000000..8dd6569662
--- /dev/null
+++ b/CMakeTests/FindOpenSLES.cmake
@@ -0,0 +1,28 @@
+# - Try to find OpenSLES
+# Once done this will define
+#  OPENSLES_FOUND - System has OpenSLES
+#  OPENSLES_INCLUDE_DIR - The OpenSLES include directory
+#  OPENSLES_LIBRARY - The library needed to use OpenSLES
+# An imported target OpenSLES::OpenSLES is also created, prefer this
+
+find_path(OPENSLES_INCLUDE_DIR
+  NAMES SLES/OpenSLES.h
+)
+
+find_library(OPENSLES_LIBRARY
+  NAMES OpenSLES
+)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(OpenSLES  DEFAULT_MSG
+                                  OPENSLES_LIBRARY OPENSLES_INCLUDE_DIR)
+
+if(OpenSLES_FOUND)
+  add_library(OpenSLES::OpenSLES UNKNOWN IMPORTED)
+  set_target_properties(OpenSLES::OpenSLES PROPERTIES
+    IMPORTED_LOCATION ${OPENSLES_LIBRARY}
+    INTERFACE_INCLUDE_DIRECTORIES ${OPENSLES_INCLUDE_DIR}
+  )
+endif()
+
+mark_as_advanced(OPENSLES_INCLUDE_DIR OPENSLES_LIBRARY )
diff --git a/Externals/portaudio/CMakeLists.txt b/Externals/portaudio/CMakeLists.txt
index b03b6297cd..ee3f119445 100644
--- a/Externals/portaudio/CMakeLists.txt
+++ b/Externals/portaudio/CMakeLists.txt
@@ -316,8 +316,9 @@ ELSE()
 
   ENDIF()
 
-  SET(PA_PKGCONFIG_LDFLAGS "${PA_PKGCONFIG_LDFLAGS} -lm -lpthread")
-  SET(PA_LIBRARY_DEPENDENCIES ${PA_LIBRARY_DEPENDENCIES} m pthread)
+  find_package(Threads)
+  SET(PA_PKGCONFIG_LDFLAGS "${PA_PKGCONFIG_LDFLAGS} -lm")
+  SET(PA_LIBRARY_DEPENDENCIES ${PA_LIBRARY_DEPENDENCIES} m Threads::Threads)
 
 ENDIF()
 
diff --git a/Source/Core/AudioCommon/CMakeLists.txt b/Source/Core/AudioCommon/CMakeLists.txt
index 9cc835707b..cd852e0366 100644
--- a/Source/Core/AudioCommon/CMakeLists.txt
+++ b/Source/Core/AudioCommon/CMakeLists.txt
@@ -6,9 +6,11 @@ set(SRCS	AudioCommon.cpp
 
 set(LIBS "")
 
+find_package(OpenSLES)
 if(OPENSLES_FOUND)
+	message(STATUS "OpenSLES found, enabling OpenSLES sound backend")
 	set(SRCS ${SRCS} OpenSLESStream.cpp)
-	set(LIBS ${LIBS} ${OPENSLES_LIBRARIES})
+	set(LIBS ${LIBS} OpenSLES::OpenSLES)
 endif()
 
 if(ALSA_FOUND)