diff --git a/ChangeLog b/ChangeLog
index 5122f08561..a7e43e9a69 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2006-04-05  Michael Smith  <msmith@fluendo.com>
+
+	* gst/gstpipeline.c: (gst_pipeline_init):
+	  When we create a pipeline bus, initially create it in flushing mode.
+	  Fixes leaks in at least one test, and makes a new pipeline work the
+	  same as one that has gone to READY and then back to NULL.
+
+	* gst/gstelement.c:
+	  Typo fix in docs.
+
 2006-04-05  Michael Smith  <msmith@fluendo.com>
 
 	* tests/check/gst/gstghostpad.c: (GST_START_TEST):
diff --git a/gst/gstelement.c b/gst/gstelement.c
index 81fe0c9a5e..24f251ac16 100644
--- a/gst/gstelement.c
+++ b/gst/gstelement.c
@@ -472,7 +472,7 @@ gst_element_set_base_time (GstElement * element, GstClockTime time)
  *
  * Returns the base time of the element. The base time is the
  * absolute time of the clock when this element was last put to
- * PLAYING. Substracting the base time from the clock time gives
+ * PLAYING. Subtracting the base time from the clock time gives
  * the stream time of the element.
  *
  * Returns: the base time of the element.
diff --git a/gst/gstpipeline.c b/gst/gstpipeline.c
index 185fc021a8..aa7c479a46 100644
--- a/gst/gstpipeline.c
+++ b/gst/gstpipeline.c
@@ -248,6 +248,10 @@ gst_pipeline_init (GTypeInstance * instance, gpointer g_class)
 
   /* create and set a default bus */
   bus = gst_bus_new ();
+  /* Start our bus in flushing if appropriate */
+  if (pipeline->priv->auto_flush_bus)
+    gst_bus_set_flushing (bus, TRUE);
+
   gst_element_set_bus (GST_ELEMENT_CAST (pipeline), bus);
   GST_DEBUG_OBJECT (pipeline, "set bus %" GST_PTR_FORMAT " on pipeline", bus);
   gst_object_unref (bus);