diff --git a/ChangeLog b/ChangeLog
index c86b92a660..b6fff09469 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2008-07-04  Sebastian Dröge  <sebastian.droege@collabora.co.uk>
+
+	Patch by: Damien Lespiau <damien dot lespiau at gmail dot com>
+
+	* configure.ac:
+	Fix checking of headers for the OSS4 plugin to fail if a single
+	header doesn't exist already. AC_CHECK_HEADERS only fails if none
+	of the headers is found. Fixes bug #541543.
+
 2008-07-04  Sebastian Dröge  <sebastian.droege@collabora.co.uk>
 
 	Patch by: Damien Lespiau <damien dot lespiau at gmail dot com>
diff --git a/configure.ac b/configure.ac
index ab215942fe..e74fee1aca 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1083,7 +1083,8 @@ translit(dnm, m, l) AM_CONDITIONAL(USE_OSS4, true)
 AG_GST_CHECK_FEATURE(OSS4, [Open Sound System 4], oss4, [
   AC_MSG_CHECKING([Checking if we can build the OSS4 elements])
   AC_CHECK_HEADERS([fcntl.h sys/ioctl.h sys/stat.h sys/types.h],
-      [HAVE_OSS4="yes"], [HAVE_OSS4="no"])
+      [test -z "$OSS4_MISSING_HEADER" && HAVE_OSS4="yes"],
+      [OSS4_MISSING_HEADER="yes";HAVE_OSS4="no"])
 ])
 
 dnl *** wininet ***