diff --git a/ChangeLog b/ChangeLog
index d64511f177..17d935d8ae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-12-16  David Schleef  <ds@schleef.org>
+
+	* configure.ac: look for musepack headers as musepack/*.h
+	(fixes #159847)
+	* ext/musepack/gstmusepackdec.h: use <musepack/*.h>
+	* ext/musepack/gstmusepackreader.h: same
+
 2004-12-17  Ronald S. Bultje  <rbultje@ronald.bitfreak.net>
 
 	* gst-libs/gst/riff/riff-read.c:
diff --git a/configure.ac b/configure.ac
index e64bea7910..156939ead6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1418,16 +1418,13 @@ dnl *** musepack ***
 translit(dnm, m, l) AM_CONDITIONAL(USE_MUSEPACK, true)
 GST_CHECK_FEATURE(MUSEPACK, [musepackdec], musepack, [
   AC_LANG_CPLUSPLUS
-  OLD_CPPFLAGS="$CPPFLAGS"
-  CPPFLAGS="-I/usr/include/musepack $CPPFLAGS"
-  AC_CHECK_HEADER(mpc_dec.h, [
+  AC_CHECK_HEADER([musepack/mpc_dec.h], [
     HAVE_MUSEPACK="yes"
     MUSEPACK_LIBS="-lmusepack"
-    MUSEPACK_CFLAGS="-I/usr/include/musepack"
+    MUSEPACK_CFLAGS=
     AC_SUBST(MUSEPACK_CFLAGS)
     AC_SUBST(MUSEPACK_LIBS)
     ], [HAVE_MUSEPACK="no"])
-  CPPFLAGS="$OLD_CPPFLAGS"
   AC_LANG_C
 ])