diff --git a/ChangeLog b/ChangeLog
index 36dcbf1b90..c4a70a98a3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-08-25  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+	* gst/audioconvert/gstaudioconvert.c: (gst_audio_convert_dispose),
+	(audio_convert_get_unit_size):
+	  plug some leaks
+
 2005-08-25  Thomas Vander Stichele  <thomas at apestaart dot org>
 
 	* check/Makefile.am:
diff --git a/gst/audioconvert/gstaudioconvert.c b/gst/audioconvert/gstaudioconvert.c
index 9815add0df..1f8420cf60 100644
--- a/gst/audioconvert/gstaudioconvert.c
+++ b/gst/audioconvert/gstaudioconvert.c
@@ -226,6 +226,9 @@ gst_audio_convert_dispose (GObject * obj)
     g_free (this->srccaps.pos);
     this->srccaps.pos = NULL;
   }
+
+  gst_audio_convert_unset_matrix (this);
+
   G_OBJECT_CLASS (parent_class)->dispose (obj);
 }
 
@@ -242,8 +245,11 @@ audio_convert_get_unit_size (GstBaseTransform * base, GstCaps * caps,
 
   memset (&ac_caps, 0, sizeof (ac_caps));
 
-  if (!gst_audio_convert_parse_caps (caps, &ac_caps))
+  if (!gst_audio_convert_parse_caps (caps, &ac_caps)) {
+    g_free (ac_caps.pos);
     return FALSE;
+  }
+  g_free (ac_caps.pos);
 
   *size = ac_caps.width * ac_caps.channels / 8;
   return TRUE;