diff --git a/ChangeLog b/ChangeLog
index 3ebaddb16c..0faef610e6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-02-12  Zaheer Abbas Merali  <zaheerabbas at merali dot org>
+
+	* sys/dvb/dvbbasebin.c:
+	Fix leak of location string returned from gst_uri_get_location.
+	Fixes bug #516114
+
 2008-02-12  David Schleef  <ds@schleef.org>
 
 	* configure.ac:
diff --git a/sys/dvb/dvbbasebin.c b/sys/dvb/dvbbasebin.c
index bc13eddb02..e10adab31d 100644
--- a/sys/dvb/dvbbasebin.c
+++ b/sys/dvb/dvbbasebin.c
@@ -992,8 +992,13 @@ dvb_base_bin_uri_set_uri (GstURIHandler * handler, const gchar * uri)
   if (strcmp (protocol, "dvb") != 0) {
     ret = FALSE;
   } else {
-    ret = set_properties_for_channel (G_OBJECT (dvbbasebin),
-        gst_uri_get_location (uri));
+    gchar *location = gst_uri_get_location (uri);
+
+    if (location != NULL) {
+      ret = set_properties_for_channel (G_OBJECT (dvbbasebin), location);
+      g_free (location);
+    } else
+      ret = FALSE;
   }
 
   /* here is where we parse channels.conf */