diff --git a/ChangeLog b/ChangeLog
index cae6db5c38..0b90bfcfa2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-07-21  Sebastian Dröge  <sebastian.droege@collabora.co.uk>
+
+	* gst/modplug/libmodplug/Makefile.am:
+	Use GST_CXXFLAGS instead of GST_CFLAGS for CXXFLAGS. GST_CFLAGS
+	can contain compiler parameters that are invalid for C++.
+	Fixes bug #543860.
+
 2008-07-21  Sebastian Dröge  <sebastian.droege@collabora.co.uk>
 
 	* ext/resindvd/Makefile.am:
diff --git a/gst/modplug/libmodplug/Makefile.am b/gst/modplug/libmodplug/Makefile.am
index b900a60d36..6e6ae8fe97 100644
--- a/gst/modplug/libmodplug/Makefile.am
+++ b/gst/modplug/libmodplug/Makefile.am
@@ -1,6 +1,6 @@
 noinst_LTLIBRARIES = libmodplug.la
 
-libmodplug_la_CXXFLAGS = $(GST_CFLAGS) -D_REENTRANT
+libmodplug_la_CXXFLAGS = $(GST_CXXFLAGS) -D_REENTRANT
 libmodplug_la_LDFLAGS = -module -avoid-version
 libmodplug_la_SOURCES = tables.cpp         \
                         sndmix.cpp         \