diff --git a/ChangeLog b/ChangeLog
index 4fcd4b53ba..11cb6dc547 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-06-04  Tim-Philipp Müller  <tim.muller at collabora co uk>
+
+	* ext/taglib/Makefile.am::
+	  Add -Wno-attributes to CXXFLAGS to suppress warning caused by
+	  taglib headers (with gcc 4.3.1).
+
 2008-06-04  Peter Kjellerstedt  <pkj@axis.com>
 
 	* gst/rtsp/gstrtspsrc.c: (gst_rtspsrc_stream_configure_udp_sink):
diff --git a/ext/taglib/Makefile.am b/ext/taglib/Makefile.am
index d9884eba3c..b52916e7c8 100644
--- a/ext/taglib/Makefile.am
+++ b/ext/taglib/Makefile.am
@@ -7,7 +7,7 @@ libgsttaglib_la_CFLAGS = \
 	$(TAGLIB_CFLAGS)
 libgsttaglib_la_CXXFLAGS = \
 	$(GST_PLUGINS_BASE_CFLAGS) \
-	$(GST_CXXFLAGS) \
+	$(GST_CXXFLAGS) -Wno-attributes \
 	$(TAGLIB_CFLAGS)
 libgsttaglib_la_LIBADD = \
 	$(GST_PLUGINS_BASE_LIBS) -lgsttag-$(GST_MAJORMINOR) \