diff --git a/ChangeLog b/ChangeLog
index e17a56699e..1d2106b837 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-03-28  Tim-Philipp Müller  <tim at centricular dot net>
+
+	* ext/lame/gstlame.c: (gst_lame_init), (gst_lame_set_property),
+	(gst_lame_get_property), (gst_lame_setup):
+	* ext/lame/gstlame.h:
+	  Make xingheader property non-functional, it's broken anyway
+	  after all (use xingmux instead).
+
 2006-03-28  Tim-Philipp Müller  <tim at centricular dot net>
 
 	* ext/lame/gstlame.c: (gst_lame_sink_event):
diff --git a/ext/lame/gstlame.c b/ext/lame/gstlame.c
index ef93fd4330..a6a3f067e4 100644
--- a/ext/lame/gstlame.c
+++ b/ext/lame/gstlame.c
@@ -217,10 +217,10 @@ enum
   ARG_EMPHASIS,
   ARG_VBR_QUALITY,
 #ifdef GSTLAME_PRESET
-  ARG_XINGHEADER,
+  ARG_XINGHEADER,               /* FIXME: remove in 0.11 */
   ARG_PRESET
 #else
-  ARG_XINGHEADER
+  ARG_XINGHEADER                /* FIXME: remove in 0.11 */
 #endif
 };
 
@@ -582,7 +582,6 @@ gst_lame_init (GstLame * lame)
   lame->allow_diff_short = lame_get_allow_diff_short (lame->lgf);
   lame->no_short_blocks = TRUE; /* lame_get_no_short_blocks (lame->lgf); */
   lame->emphasis = lame_get_emphasis (lame->lgf);
-  lame->xingheader = FALSE;
   lame->preset = 0;
   lame_close (lame->lgf);
   lame->lgf = NULL;
@@ -813,7 +812,6 @@ gst_lame_set_property (GObject * object, guint prop_id, const GValue * value,
       lame->emphasis = g_value_get_boolean (value);
       break;
     case ARG_XINGHEADER:
-      lame->xingheader = g_value_get_boolean (value);
       break;
 #ifdef GSTLAME_PRESET
     case ARG_PRESET:
@@ -931,7 +929,6 @@ gst_lame_get_property (GObject * object, guint prop_id, GValue * value,
       g_value_set_boolean (value, lame->emphasis);
       break;
     case ARG_XINGHEADER:
-      g_value_set_boolean (value, lame->xingheader);
       break;
 #ifdef GSTLAME_PRESET
     case ARG_PRESET:
@@ -1184,7 +1181,6 @@ gst_lame_setup (GstLame * lame)
   CHECK_ERROR (lame_set_allow_diff_short (lame->lgf, lame->allow_diff_short));
   CHECK_ERROR (lame_set_no_short_blocks (lame->lgf, lame->no_short_blocks));
   CHECK_ERROR (lame_set_emphasis (lame->lgf, lame->emphasis));
-  CHECK_ERROR (lame_set_bWriteVbrTag (lame->lgf, lame->xingheader ? 1 : 0));
 #ifdef GSTLAME_PRESET
   if (lame->preset > 0) {
     CHECK_ERROR (lame_set_preset (lame->lgf, lame->preset));
diff --git a/ext/lame/gstlame.h b/ext/lame/gstlame.h
index 8b032051b8..e978cac8d0 100644
--- a/ext/lame/gstlame.h
+++ b/ext/lame/gstlame.h
@@ -24,9 +24,7 @@
 
 #include <gst/gst.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #include <lame/lame.h>
 
@@ -38,7 +36,7 @@ extern "C" {
   (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_LAME,GstLameClass))
 #define GST_IS_LAME(obj) \
   (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_LAME))
-#define GST_IS_LAME_CLASS(obj) \
+#define GST_IS_LAME_CLASS(klass) \
   (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_LAME))
 
 typedef enum {
@@ -91,7 +89,6 @@ struct _GstLame {
   gboolean allow_diff_short;
   gboolean no_short_blocks;
   gboolean emphasis;
-  gboolean xingheader;
   gint preset;
 
   lame_global_flags *lgf;
@@ -110,9 +107,7 @@ struct _GstLameClass {
 
 GType gst_lame_get_type(void);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 
 #endif /* __GST_LAME_H__ */