diff --git a/Makefile b/Makefile
index 7e831ded3c..469d1dfdf1 100644
--- a/Makefile
+++ b/Makefile
@@ -55,11 +55,13 @@ endif
 
 ifeq ($(HAVE_ALSA), 1)
    OBJ += audio/alsa.o
-   LIBS += -lasound
+   LIBS += $(ALSA_LIBS)
+   DEFINES += $(ALSA_CFLAGS)
 endif
 ifeq ($(HAVE_ROAR), 1)
    OBJ += audio/roar.o
-   LIBS += -lroar
+   LIBS += $(ROAR_LIBS)
+   DEFINES += $(ROAR_CFLAGS)
 endif
 ifeq ($(HAVE_AL), 1)
    OBJ += audio/openal.o
diff --git a/audio/alsa.c b/audio/alsa.c
index 924e803dd3..014c6c5b09 100644
--- a/audio/alsa.c
+++ b/audio/alsa.c
@@ -18,7 +18,7 @@
 
 #include "driver.h"
 #include <stdlib.h>
-#include <alsa/asoundlib.h>
+#include <asoundlib.h>
 #include "general.h"
 
 #define TRY_ALSA(x) if ( x < 0 ) { \
diff --git a/qb/config.libs.sh b/qb/config.libs.sh
index 17a3a20909..01a5bbccbf 100644
--- a/qb/config.libs.sh
+++ b/qb/config.libs.sh
@@ -24,7 +24,7 @@ fi
 check_lib DYLIB $DYLIB dlopen
 check_lib NETPLAY -lc socket
 
-check_lib ALSA -lasound snd_pcm_open
+check_pkgconf ALSA alsa
 check_header OSS sys/soundcard.h
 check_header OSS_BSD soundcard.h
 check_lib OSS_LIB -lossaudio
@@ -42,7 +42,7 @@ else
 fi
 
 check_pkgconf RSOUND rsound 1.1
-check_lib ROAR -lroar roar_vs_new
+check_pkgconf ROAR libroar
 check_pkgconf JACK jack 0.120.1
 check_pkgconf PULSE libpulse