diff --git a/ChangeLog b/ChangeLog
index ebfa870d82..79b9f0729c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-11-20  Julien MOUTTE  <julien@moutte.net>
+
+	* gst/matroska/matroska-mux.c: (gst_matroska_mux_start): Replace
+	GST_PAD_IS_USABLE by something approaching it.
+
 2005-11-20  Julien MOUTTE  <julien@moutte.net>
 
 	* gst/matroska/matroska-mux.c: (gst_matroska_mux_start): Fix for
diff --git a/gst/matroska/matroska-mux.c b/gst/matroska/matroska-mux.c
index bba6ee234b..8586c9f1a7 100644
--- a/gst/matroska/matroska-mux.c
+++ b/gst/matroska/matroska-mux.c
@@ -1087,7 +1087,8 @@ gst_matroska_mux_start (GstMatroskaMux * mux)
     collect_pad = (GstMatroskaPad *) collected->data;
     thepad = collect_pad->collect.pad;
 
-    if (collect_pad->track->codec_id != 0) {
+    if (gst_pad_is_linked (thepad) && gst_pad_is_active (thepad) &&
+        collect_pad->track->codec_id != 0) {
       collect_pad->track->num = tracknum++;
       child = gst_ebml_write_master_start (ebml, GST_MATROSKA_ID_TRACKENTRY);
       gst_matroska_mux_track_header (mux, collect_pad->track);