diff --git a/ChangeLog b/ChangeLog
index 9c17027cfa..b222cf4f4c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2005-01-09  Ronald S. Bultje  <rbultje@ronald.bitfreak.net>
+
+	* ext/alsa/gstalsa.c: (gst_alsa_change_state):
+	  Reset variables on READY.
+	* gst/matroska/matroska-mux.c: (gst_matroska_mux_request_new_pad),
+	(gst_matroska_mux_loop):
+	  Require data before writing header.
+
 2005-01-09  Francis Labonte  <francis_labonte@hotmail.com>
 
 	Reviewed by:  Ronald S. Bultje  <rbultje@ronald.bitfreak.net>
diff --git a/gst/matroska/matroska-mux.c b/gst/matroska/matroska-mux.c
index d126706712..cdd631e752 100644
--- a/gst/matroska/matroska-mux.c
+++ b/gst/matroska/matroska-mux.c
@@ -645,8 +645,8 @@ gst_matroska_mux_request_new_pad (GstElement * element,
 
   pad = gst_pad_new_from_template (templ, name);
   g_free (name);
-  gst_element_add_pad (element, pad);
   gst_pad_set_link_function (pad, linkfunc);
+  gst_element_add_pad (element, pad);
   context->index = mux->num_streams++;
   mux->sink[context->index].track = context;
   context->pad = pad;
@@ -1132,6 +1132,11 @@ gst_matroska_mux_loop (GstElement * element)
   GstMatroskaMux *mux = GST_MATROSKA_MUX (element);
   guint i;
 
+  if (gst_matroska_mux_prepare_data (mux) == -1) {
+    GST_ELEMENT_ERROR (element, STREAM, MUX, (NULL), ("No data"));
+    return;
+  }
+
   /* start with a header */
   if (mux->state == GST_MATROSKA_MUX_STATE_START) {
     if (mux->num_streams == 0) {