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/ext/alsa/gstalsa.c b/ext/alsa/gstalsa.c
index e563f449e3..f1e1abf35a 100644
--- a/ext/alsa/gstalsa.c
+++ b/ext/alsa/gstalsa.c
@@ -1190,6 +1190,8 @@ gst_alsa_change_state (GstElement * element)
         gst_alsa_stop_audio (this);
       g_free (this->format);
       this->format = NULL;
+      this->played = 0;
+      this->captured = 0;
       break;
     case GST_STATE_READY_TO_NULL:
       if (GST_FLAG_IS_SET (element, GST_ALSA_OPEN))