diff --git a/ChangeLog b/ChangeLog
index 4aaddbfbfa..b29467a38f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-07-05  Wim Taymans  <wim@fluendo.com>
+
+	* gst/gstregistryxml.c: (read_string):
+	Avoid strdup. (will happen in libxml, but hey!)
+
+	* gst/gsturi.c:
+	Add some more docs.
+
 2006-07-05  Wim Taymans  <wim@fluendo.com>
 
 	* gst/gstbuffer.c: (_gst_buffer_copy), (gst_buffer_create_sub):
diff --git a/gst/gstregistryxml.c b/gst/gstregistryxml.c
index 9cbac87e80..a427e77955 100644
--- a/gst/gstregistryxml.c
+++ b/gst/gstregistryxml.c
@@ -125,7 +125,7 @@ read_string (xmlTextReaderPtr reader, gchar ** write_to, gboolean allow_blank)
     if (xmlTextReaderNodeType (reader) == XML_READER_TYPE_TEXT) {
       if (found)
         return FALSE;
-      *write_to = g_strdup ((gchar *) xmlTextReaderConstValue (reader));
+      *write_to = (gchar *) xmlTextReaderValue (reader);
       found = TRUE;
     }
   }
diff --git a/gst/gsturi.c b/gst/gsturi.c
index 7092c8be07..c43dace3c1 100644
--- a/gst/gsturi.c
+++ b/gst/gsturi.c
@@ -609,8 +609,9 @@ gst_uri_handler_get_protocols (GstURIHandler * handler)
  *
  * Gets the currently handled URI.
  *
- * Returns: the URI currently handler by the @handler.
- * Returns NULL if there are no URI currently handled.
+ * Returns: the URI currently handled by the @handler.
+ * Returns NULL if there are no URI currently handled. The returned
+ * string must not be modified or freed.
  */
 G_CONST_RETURN gchar *
 gst_uri_handler_get_uri (GstURIHandler * handler)