diff --git a/ChangeLog b/ChangeLog
index 6c2421834d..817e28dc0e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-02-07  Jan Schmidt  <jan.schmidt@sun.com>
+
+	* gst/xingheader/Makefile.am:
+	Put CFLAGS and LIBS in the right order
+
 2008-02-06  Tim-Philipp Müller  <tim at centricular dot net>
 
 	* configure.ac:
diff --git a/gst/xingheader/Makefile.am b/gst/xingheader/Makefile.am
index 5517b8ad77..64c1716fc3 100644
--- a/gst/xingheader/Makefile.am
+++ b/gst/xingheader/Makefile.am
@@ -1,9 +1,9 @@
 plugin_LTLIBRARIES = libgstxingheader.la
 
 libgstxingheader_la_SOURCES = gstxingmux.c
-libgstxingheader_la_CFLAGS = $(GST_CFLAGS)
+libgstxingheader_la_CFLAGS = $(GST_BASE_CFLAGS) $(GST_CFLAGS)
 libgstxingheader_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstxingheader_la_LIBADD = $(GST_LIBS) $(GST_BASE_LIBS)
+libgstxingheader_la_LIBADD = $(GST_BASE_LIBS) $(GST_LIBS)
 
 
 noinst_HEADERS = gstxingmux.h