diff --git a/ChangeLog b/ChangeLog
index a4cb493330..855d82ed5c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-03-27  Tim-Philipp Müller  <tim at centricular dot net>
+
+	Patch by: Tommi Myöhänen  <ext-tommi dot myohanen at nokia dot com>
+
+	* ext/gnomevfs/gstgnomevfssrc.c: (gst_gnome_vfs_src_finalize),
+	(gst_gnome_vfs_src_get_icy_metadata):
+	  Fix some minor memory leaks (#336194).
+
 2006-03-27  Tim-Philipp Müller  <tim at centricular dot net>
 
 	* ext/gnomevfs/gstgnomevfs.c:
diff --git a/ext/gnomevfs/gstgnomevfssrc.c b/ext/gnomevfs/gstgnomevfssrc.c
index 8da0311148..6837a105be 100644
--- a/ext/gnomevfs/gstgnomevfssrc.c
+++ b/ext/gnomevfs/gstgnomevfssrc.c
@@ -314,10 +314,20 @@ gst_gnome_vfs_src_finalize (GObject * object)
     src->uri = NULL;
   }
 
-  if (src->uri_name) {
-    g_free (src->uri_name);
-    src->uri_name = NULL;
-  }
+  g_free (src->uri_name);
+  src->uri_name = NULL;
+
+  g_free (src->iradio_name);
+  src->iradio_name = NULL;
+
+  g_free (src->iradio_genre);
+  src->iradio_genre = NULL;
+
+  g_free (src->iradio_url);
+  src->iradio_url = NULL;
+
+  g_free (src->iradio_title);
+  src->iradio_title = NULL;
 
   g_mutex_free (src->audiocast_udpdata_mutex);
   g_mutex_free (src->audiocast_queue_mutex);
@@ -933,6 +943,7 @@ gst_gnome_vfs_src_get_icy_metadata (GstGnomeVFSSrc * src)
   }
 
   g_strfreev (tags);
+  g_free (data);
 }
 
 /* end of icecast/audiocast metadata extraction support code */