diff --git a/ChangeLog b/ChangeLog
index c6a8cba75c..c2c6d7a871 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-11-17  Sebastian Dröge  <sebastian.droege@collabora.co.uk>
+
+	* ext/sidplay/Makefile.am:
+	Use GST_CXXFLAGS for C++ code instead of GST_CFLAGS. The latter could
+	contain CFLAGS that do not exist for C++, like -Wvla or
+	-Wdeclaration-after-statement. Fixes bug #561161.
+
 2008-11-12  Jan Schmidt  <jan.schmidt@sun.com>
 
 	* configure.ac:
diff --git a/ext/sidplay/Makefile.am b/ext/sidplay/Makefile.am
index 373ae59064..ff9f98aa7b 100644
--- a/ext/sidplay/Makefile.am
+++ b/ext/sidplay/Makefile.am
@@ -1,7 +1,7 @@
 plugin_LTLIBRARIES = libgstsid.la
 
 libgstsid_la_SOURCES = gstsiddec.cc
-libgstsid_la_CXXFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_CXXFLAGS) $(SIDPLAY_CFLAGS)
+libgstsid_la_CXXFLAGS = $(GST_CXXFLAGS) $(GST_BASE_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_CXXFLAGS) $(SIDPLAY_CFLAGS)
 libgstsid_la_LIBADD = $(GST_LIBS) $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) $(SIDPLAY_LIBS)
 libgstsid_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstsid_la_LIBTOOLFLAGS = --tag=disable-static