diff --git a/ChangeLog b/ChangeLog
index 1c6f14699c..9e7a72dcbd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2004-02-05  Benjamin Otte  <in7y118@public.uni-hamburg.de>
+
+	* ext/alsa/gstalsa.c: (gst_alsa_change_state):
+	  be sure to stop the clock when going to paused
+	* sys/oss/gstosssink.c: (gst_osssink_change_state):
+	  reset number of transmitted when going to ready.
+	fixes #132935
+
+2004-02-05  Charles Schmidt <cschmidt2@emich.edu>
+
+	reviewed by Benjamin Otte
+
+	* ext/mad/gstid3tag.c: (gst_mad_id3_to_tag_list):
+	  extract track count (fixes #133410)
+
 2004-02-04  Benjamin Otte  <in7y118@public.uni-hamburg.de>
 
 	* ext/mad/gstid3tag.c: (gst_id3_tag_do_caps_nego):
diff --git a/ext/alsa/gstalsa.c b/ext/alsa/gstalsa.c
index 58d2aeec6d..09793bc837 100644
--- a/ext/alsa/gstalsa.c
+++ b/ext/alsa/gstalsa.c
@@ -734,11 +734,11 @@ gst_alsa_change_state (GstElement *element)
           return GST_STATE_FAILURE;
         }
       }
-      break;
+    } else {
+      /* if device doesn't know how to pause, we just stop */
+      if (GST_FLAG_IS_SET (element, GST_ALSA_RUNNING)) gst_alsa_stop_audio (this);
     }
     gst_alsa_clock_stop (this->clock);
-    /* if device doesn't know how to pause, we just stop */
-    if (GST_FLAG_IS_SET (element, GST_ALSA_RUNNING)) gst_alsa_stop_audio (this);
     break;
   case GST_STATE_PAUSED_TO_READY:
     if (GST_FLAG_IS_SET (element, GST_ALSA_RUNNING)) gst_alsa_stop_audio (this);