diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3f28d45f2..ff1648c21 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -509,7 +509,6 @@ endif(APPLE)
 # OpenBSD
 if(OPENBSD)
 	set(WITH_MANPAGES "ON")
-	set(WITH_ALSA "OFF")
 	set(WITH_PULSE "OFF")
 	set(WITH_OSS "OFF")
 	set(WITH_SNDIO "ON")
@@ -596,10 +595,6 @@ set(OSS_FEATURE_TYPE "RECOMMENDED")
 set(OSS_FEATURE_PURPOSE "sound")
 set(OSS_FEATURE_DESCRIPTION "audio input, audio output and multimedia redirection")
 
-set(ALSA_FEATURE_TYPE "RECOMMENDED")
-set(ALSA_FEATURE_PURPOSE "sound")
-set(ALSA_FEATURE_DESCRIPTION "audio input, audio output and multimedia redirection")
-
 set(SNDIO_FEATURE_TYPE "OPTIONAL")
 set(SNDIO_FEATURE_PURPOSE "sound")
 set(SNDIO_FEATURE_DESCRIPTION "OpenBSD audio input/output")
@@ -659,7 +654,6 @@ set(SOXR_FEATURE_DESCRIPTION "SOX audio resample library")
 if(WIN32)
 	set(WAYLAND_FEATURE_TYPE "DISABLED")
 	set(OSS_FEATURE_TYPE "DISABLED")
-	set(ALSA_FEATURE_TYPE "DISABLED")
 	set(SNDIO_FEATURE_TYPE "DISABLED")
 	set(PULSE_FEATURE_TYPE "DISABLED")
 	set(PCSC_FEATURE_TYPE "DISABLED")
@@ -672,7 +666,6 @@ if(APPLE)
 	set(VAAPI_FEATURE_TYPE "DISABLED")
 	set(WAYLAND_FEATURE_TYPE "DISABLED")
 	set(OSS_FEATURE_TYPE "DISABLED")
-	set(ALSA_FEATURE_TYPE "DISABLED")
 	set(SNDIO_FEATURE_TYPE "DISABLED")
 	if(IOS)
 		set(PULSE_FEATURE_TYPE "DISABLED")
@@ -698,7 +691,6 @@ endif(UNIX AND NOT ANDROID)
 if(ANDROID)
 	set(WAYLAND_FEATURE_TYPE "DISABLED")
 	set(OSS_FEATURE_TYPE "DISABLED")
-	set(ALSA_FEATURE_TYPE "DISABLED")
 	set(SNDIO_FEATURE_TYPE "DISABLED")
 	set(PULSE_FEATURE_TYPE "DISABLED")
 	set(PCSC_FEATURE_TYPE "DISABLED")
@@ -711,7 +703,6 @@ find_feature(OpenSSL ${OPENSSL_FEATURE_TYPE} ${OPENSSL_FEATURE_PURPOSE} ${OPENSS
 find_feature(MbedTLS ${MBEDTLS_FEATURE_TYPE} ${MBEDTLS_FEATURE_PURPOSE} ${MBEDTLS_FEATURE_DESCRIPTION})
 
 find_feature(OSS ${OSS_FEATURE_TYPE} ${OSS_FEATURE_PURPOSE} ${OSS_FEATURE_DESCRIPTION})
-find_feature(ALSA ${ALSA_FEATURE_TYPE} ${ALSA_FEATURE_PURPOSE} ${ALSA_FEATURE_DESCRIPTION})
 find_feature(Pulse ${PULSE_FEATURE_TYPE} ${PULSE_FEATURE_PURPOSE} ${PULSE_FEATURE_DESCRIPTION})
 
 find_feature(PCSC ${PCSC_FEATURE_TYPE} ${PCSC_FEATURE_PURPOSE} ${PCSC_FEATURE_DESCRIPTION})
diff --git a/channels/audin/client/alsa/CMakeLists.txt b/channels/audin/client/alsa/CMakeLists.txt
index 8733f9b5e..1213f7474 100644
--- a/channels/audin/client/alsa/CMakeLists.txt
+++ b/channels/audin/client/alsa/CMakeLists.txt
@@ -17,6 +17,8 @@
 
 define_channel_client_subsystem("audin" "alsa" "")
 
+find_package(ALSA REQUIRED)
+
 set(${MODULE_PREFIX}_SRCS
 	audin_alsa.c
 )
diff --git a/channels/rdpsnd/client/alsa/CMakeLists.txt b/channels/rdpsnd/client/alsa/CMakeLists.txt
index bf9036a4d..3041b952e 100644
--- a/channels/rdpsnd/client/alsa/CMakeLists.txt
+++ b/channels/rdpsnd/client/alsa/CMakeLists.txt
@@ -17,6 +17,8 @@
 
 define_channel_client_subsystem("rdpsnd" "alsa" "")
 
+find_package(ALSA REQUIRED)
+
 set(${MODULE_PREFIX}_SRCS
 	rdpsnd_alsa.c)
 
diff --git a/channels/tsmf/client/alsa/CMakeLists.txt b/channels/tsmf/client/alsa/CMakeLists.txt
index 2eb3f8b39..991054253 100644
--- a/channels/tsmf/client/alsa/CMakeLists.txt
+++ b/channels/tsmf/client/alsa/CMakeLists.txt
@@ -17,6 +17,8 @@
 
 define_channel_client_subsystem("tsmf" "alsa" "audio")
 
+find_package(ALSA REQUIRED)
+
 set(${MODULE_PREFIX}_SRCS
 	tsmf_alsa.c
 )
@@ -24,6 +26,7 @@ set(${MODULE_PREFIX}_SRCS
 set(${MODULE_PREFIX}_LIBS
     winpr
     freerdp
+    ${ALSA_LIBRARIES}
 )
 
 include_directories(..)