diff --git a/ChangeLog b/ChangeLog
index fd3c7aaeeb..fa6227de02 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-04-26  Benjamin Otte  <otte@gnome.org>
+
+	* configure.ac:
+	  detect faad correctly as non-working if it's indeed non-working
+
 2004-04-26  Thomas Vander Stichele  <thomas at apestaart dot org>
 
 	* Makefile.am:
diff --git a/configure.ac b/configure.ac
index fd895173af..b0f3c07edd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -865,16 +865,19 @@ GST_CHECK_FEATURE(FAAC, [AAC encoder plug-in], faac, [
 dnl **** Free AAC Decoder (FAAD) ****
 translit(dnm, m, l) AM_CONDITIONAL(USE_FAAD, true)
 GST_CHECK_FEATURE(FAAD, [AAC decoder plug-in], faad, [
-  GST_CHECK_LIBHEADER(FAAD, faad, faacDecOpen, -lm, faad.h, FAAD_LIBS="-lfaad -lm")
-  AC_MSG_CHECKING([Checking for FAAD >= 2])
-  AC_TRY_COMPILE([
+  HAVE_FAAD="yes"
+  GST_CHECK_LIBHEADER(FAAD, faad, faacDecOpen, -lm, faad.h, FAAD_LIBS="-lfaad -lm", HAVE_FAAD="no")
+  if test $HAVE_FAAD = "yes"; then
+    AC_MSG_CHECKING([Checking for FAAD >= 2])
+    AC_TRY_COMPILE([
 #include <faad.h>
 #if !defined(FAAD2_VERSION) || !defined(FAAD_FMT_DOUBLE)
 #error Not faad2
 #endif
-  ], [ return 0; ],
-     [ HAVE_FAAD="yes" && AC_MSG_RESULT(yes)],
-     [ HAVE_FAAD="no"  && AC_MSG_RESULT(no)])
+    ], [ return 0; ],
+       [ HAVE_FAAD="yes" && AC_MSG_RESULT(yes)],
+       [ HAVE_FAAD="no"  && AC_MSG_RESULT(no)])
+  fi;
   AS_SCRUB_INCLUDE(FAAD_CFLAGS)
   AC_SUBST(FAAD_LIBS)
 ])