diff --git a/ChangeLog b/ChangeLog
index 3a402725c8..58553e55d0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-01-09  Edward Hervey  <edward@fluendo.com>
+
+	* gst/base.defs:
+	Revert guint8* to gchar* modifications for the adapter
+	* gst/gst.defs:
+	Cleanups and API additions
+
 2006-01-08  Martin Soto  <martinsoto@users.sourceforge.net>
 
 	* gst/gststructure.override: (_wrap_gst_structure_set_value):
diff --git a/gst/base.defs b/gst/base.defs
index af695f2e0e..4ee188e16d 100644
--- a/gst/base.defs
+++ b/gst/base.defs
@@ -81,7 +81,7 @@
 (define-method peek
   (of-object "GstAdapter")
   (c-name "gst_adapter_peek")
-  (return-type "const-gchar*")
+  (return-type "const-guint8*")
   (parameters
     '("guint" "size")
   )
@@ -99,7 +99,7 @@
 (define-method take
   (of-object "GstAdapter")
   (c-name "gst_adapter_take")
-  (return-type "gchar*")
+  (return-type "guint8*")
   (parameters
     '("guint" "nbytes")
   )
diff --git a/gst/gst.defs b/gst/gst.defs
index b6aa6be062..4ea2c58c8b 100644
--- a/gst/gst.defs
+++ b/gst/gst.defs
@@ -5927,6 +5927,7 @@
     '("gchar**" "extensions")
     '("const-GstCaps*" "possible_caps")
     '("gpointer" "data")
+    '("GDestroyNotify" "data_notify")
   )
 )
 
@@ -6086,16 +6087,16 @@
   )
 )
 
-(define-function gdouble_to_guint64
-  (c-name "gst_gdouble_to_guint64")
+(define-function util_gdouble_to_guint64
+  (c-name "gst_util_gdouble_to_guint64")
   (return-type "guint64")
   (parameters
     '("gdouble" "value")
   )
 )
 
-(define-function guint64_to_gdouble
-  (c-name "gst_guint64_to_gdouble")
+(define-function util_guint64_to_gdouble
+  (c-name "gst_util_guint64_to_gdouble")
   (return-type "gdouble")
   (parameters
     '("guint64" "value")
@@ -6112,7 +6113,7 @@
   )
 )
 
-(define-function gst_util_uint64_scale_int
+(define-function util_uint64_scale_int
   (c-name "gst_util_uint64_scale_int")
   (return-type "guint64")
   (parameters