diff --git a/ChangeLog b/ChangeLog
index 5f29fda135..bf2fe6dd6d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2008-03-07  Sebastian Dröge  <slomo@circular-chaos.org>
+
+	* configure.ac:
+	* gst/audiofx/Makefile.am:
+	* gst/audiofx/audiochebband.c:
+	* gst/audiofx/audiocheblimit.c:
+	* gst/audiofx/math_compat.h:
+	Check for sinh(), cosh() and asinh() and define our own
+	implementations if they're not available. Fixes bug #520880.
+
 2008-03-07  Sebastian Dröge  <slomo@circular-chaos.org>
 
 	Patch by: Olivier Crete <tester at tester dot ca>
diff --git a/configure.ac b/configure.ac
index ea534dd35a..b198f3c960 100644
--- a/configure.ac
+++ b/configure.ac
@@ -180,7 +180,7 @@ dnl *** checks for library functions ***
 
 LIBS_SAVE=$LIBS
 LIBS="$LIBS $LIBM"
-AC_CHECK_FUNCS(rint)
+AC_CHECK_FUNCS(rint sinh cosh asinh)
 LIBS=$LIBS_SAVE
 
 dnl Check for mmap (needed by electricfence plugin)
diff --git a/gst/audiofx/Makefile.am b/gst/audiofx/Makefile.am
index b630ec7092..3c0df213f9 100644
--- a/gst/audiofx/Makefile.am
+++ b/gst/audiofx/Makefile.am
@@ -34,5 +34,6 @@ noinst_HEADERS = audiopanorama.h \
 	audiocheblimit.h \
 	audiochebband.h \
 	audiowsincband.h \
-        audiowsinclimit.h
+        audiowsinclimit.h \
+	math_compat.h
 
diff --git a/gst/audiofx/audiochebband.c b/gst/audiofx/audiochebband.c
index 10302ab066..40f35d205e 100644
--- a/gst/audiofx/audiochebband.c
+++ b/gst/audiofx/audiochebband.c
@@ -85,6 +85,8 @@
 
 #include <math.h>
 
+#include "math_compat.h"
+
 #include "audiochebband.h"
 
 #define GST_CAT_DEFAULT gst_audio_cheb_band_debug
diff --git a/gst/audiofx/audiocheblimit.c b/gst/audiofx/audiocheblimit.c
index 6938a533ac..47fadf98ac 100644
--- a/gst/audiofx/audiocheblimit.c
+++ b/gst/audiofx/audiocheblimit.c
@@ -81,6 +81,8 @@
 
 #include <math.h>
 
+#include "math_compat.h"
+
 #include "audiocheblimit.h"
 
 #define GST_CAT_DEFAULT gst_audio_cheb_limit_debug
diff --git a/gst/audiofx/math_compat.h b/gst/audiofx/math_compat.h
new file mode 100644
index 0000000000..87296981e4
--- /dev/null
+++ b/gst/audiofx/math_compat.h
@@ -0,0 +1,55 @@
+/* 
+ * GStreamer
+ * Copyright (C) 2008 Sebastian Dröge <slomo@circular-chaos.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#ifndef __MATH_COMPAT_H__
+#define __MATH_COMPAT_H__
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <glib.h>
+#include <math.h>
+
+#ifndef HAVE_ASINH
+static inline gdouble
+asinh (gdouble x)
+{
+  return log(x + sqrt (x * x + 1));
+}
+#endif
+
+#ifndef HAVE_SINH
+static inline gdouble
+sinh (gdouble x)
+{
+  return 0.5 * (exp (x) - exp (-x));
+}
+#endif
+
+#ifndef HAVE_COSH
+static inline gdouble
+cosh (gdouble x)
+{
+  return 0.5 * (exp (x) + exp (-x));
+}
+#endif
+
+#endif /* __MATH_COMPAT_H__ */