diff --git a/ChangeLog b/ChangeLog
index 00260f9788..1884e97a40 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2007-09-18  Stefan Kost  <ensonic@users.sf.net>
+
+	* ChangeLog:
+	  Add missing newline.
+
+	* gst/librfb/rfbdecoder.c:
+	  Fix the build (missing stdlib.h).
+
+	* gst/spectrum/gstspectrum.c:
+	* gst/spectrum/gstspectrum.h:
+	  Use basetransform segment so that it is correctly managed on flushes
+	  and start/stop. Report message timestamp as stream time, which is what
+	  an application can understand. (Yes these are adapted from wim recent
+	  level element changes)
+
 2007-09-16  Wim Taymans  <wim.taymans@gmail.com>
 
 	* gst/rtpmanager/gstrtpbin.c: (new_ssrc_pad_found):
@@ -531,6 +546,11 @@
 	* ext/faad/gstfaad.c: (gst_faad_chain):
 	Don't unref the buffer when it was clipped.
 
+2007-08-22  Wim Taymans  <wim.taymans@gmail.com>
+
+	* ext/faad/gstfaad.c: (gst_faad_chain):
+	Don't unref the buffer when it was clipped.
+
 2007-08-22  Julien MOUTTE  <julien@moutte.net>
 
 	* gst/flv/gstflvdemux.c: (gst_flv_demux_cleanup),
diff --git a/gst/librfb/rfbdecoder.c b/gst/librfb/rfbdecoder.c
index 490dd44c02..19d051b170 100644
--- a/gst/librfb/rfbdecoder.c
+++ b/gst/librfb/rfbdecoder.c
@@ -7,6 +7,7 @@
 #include <rfb.h>
 #include <unistd.h>
 #include <string.h>
+#include <stdlib.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
diff --git a/gst/spectrum/gstspectrum.c b/gst/spectrum/gstspectrum.c
index 72948b20b3..d9899b4974 100644
--- a/gst/spectrum/gstspectrum.c
+++ b/gst/spectrum/gstspectrum.c
@@ -358,7 +358,6 @@ gst_spectrum_start (GstBaseTransform * trans)
     memset (filter->spect_magnitude, 0, filter->bands * sizeof (gfloat));
   if (filter->spect_phase)
     memset (filter->spect_phase, 0, filter->bands * sizeof (gfloat));
-  gst_segment_init (&filter->segment, GST_FORMAT_UNDEFINED);
 
   return TRUE;
 }
@@ -383,22 +382,6 @@ gst_spectrum_event (GstBaseTransform * trans, GstEvent * event)
     case GST_EVENT_EOS:
       gst_adapter_clear (filter->adapter);
       break;
-    case GST_EVENT_NEWSEGMENT:{
-      GstFormat format;
-      gdouble rate, arate;
-      gint64 start, stop, time;
-      gboolean update;
-
-      /* the newsegment values are used to clip the input samples
-       * and to convert the incomming timestamps to running time */
-      gst_event_parse_new_segment_full (event, &update, &rate, &arate, &format,
-          &start, &stop, &time);
-
-      /* now configure the values */
-      gst_segment_set_newsegment_full (&filter->segment, update,
-          rate, arate, format, start, stop, time);
-      break;
-    }
     default:
       break;
   }
@@ -633,7 +616,7 @@ gst_spectrum_transform_ip (GstBaseTransform * trans, GstBuffer * in)
   gint nfft = 2 * spectrum->bands - 2;
 
   GstClockTime endtime =
-      gst_segment_to_running_time (&spectrum->segment, GST_FORMAT_TIME,
+      gst_segment_to_running_time (&trans->segment, GST_FORMAT_TIME,
       GST_BUFFER_TIMESTAMP (in));
   GstClockTime blktime = GST_FRAMES_TO_CLOCK_TIME (nfft, rate);
 
diff --git a/gst/spectrum/gstspectrum.h b/gst/spectrum/gstspectrum.h
index a32d4ccf7a..291b2ffc89 100644
--- a/gst/spectrum/gstspectrum.h
+++ b/gst/spectrum/gstspectrum.h
@@ -48,7 +48,6 @@ struct _GstSpectrum {
 
   GstPad *sinkpad,*srcpad;
   GstAdapter *adapter;
-  GstSegment segment;
 
   /* properties */
   gboolean message;             /* whether or not to post messages */