diff --git a/configure.in b/configure.in
index 16d365316ba1b08e1f26f986d0b0fe0696791a45..f30b11cb5ac16e4ed6c248c48c6b49b8b4b2de5d 100644
--- a/configure.in
+++ b/configure.in
@@ -187,13 +187,15 @@ fi
 AC_ARG_WITH(openal,[  --without-openal    build without OpenAL audio provider.
                           (default: auto)], openal_disabled="(disabled)")
 if test "x$with_openal" != xno; then
-  PKG_CHECK_MODULES(OPENAL, libpulse >= 0.0.8, [found_audio=yes; with_openal=yes], [with_openal=no])
+  PKG_CHECK_MODULES(OPENAL, openal >= 0.0.8, [found_audio=yes; with_openal=yes], [with_openal=no])
 fi
 AM_CONDITIONAL([HAVE_OPENAL], [test "$with_openal" != "no"])
 if test "$with_openal" = "yes"; then
   AC_DEFINE(WITH_OPENAL, 1, [Enable OpenAL support])
 fi
 
+AC_SUBST(OPENAL_CFLAGS)
+AC_SUBST(OPENAL_LIBS)
 
 #################
 # Video Providers
@@ -296,8 +298,8 @@ AC_SUBST(HUNSPELL_LDFLAGS)
 
 
 
-AC_ARG_WITH(univchardet, [  --without-univchardet      build without universalchardet support], univchardet_disabled="(disabled)")
-if test "$with_univchardet" != "no"; then
+AC_ARG_ENABLE(univchardet, [  --enable-univchardet      enable universalchardet support.], univchardet_disabled="(disabled)")
+if test "$with_univchardet" = "yes"; then
   with_univchardet="yes"
   AC_DEFINE(WITH_UNIVCHARDET, 1, [Enable universalchardet support])
 else
@@ -599,5 +601,5 @@ Subtitle Providers:
 
 Misc Packages:
   hunspell:              $with_hunspell $hunspell_disabled
-  universalchardet:      $with_univchardet $univchardet_disabled
+  universalchardet:      $with_univchardet $univchardet_disabled (broken)
 ]);