diff --git a/ChangeLog b/ChangeLog
index aec61df134..4e4079acb2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-09-30  Edward Hervey  <edward@fluendo.com>
+
+	* gst/gstpad.override:
+	Removed overriding of gst_caps_get_negotiated_caps, the codegenerator
+	handles it much better (hint:don't copy)
+
 2005-09-30  Thomas Vander Stichele  <thomas at apestaart dot org>
 
 	* gst/gst.defs:
diff --git a/gst/gstpad.override b/gst/gstpad.override
index da5836986b..477f6f1fd3 100644
--- a/gst/gstpad.override
+++ b/gst/gstpad.override
@@ -493,26 +493,6 @@ _wrap_gst_pad_link_filtered(PyGObject *self, PyObject *args, PyObject *kwargs)
     }
     return PyBool_FromLong(ret);
 }
-
-%%
-override gst_pad_get_negotiated_caps
-static PyObject *
-_wrap_gst_pad_get_negotiated_caps(PyGObject *self)
-{
-    const GstCaps *ret;
-
-    ret = gst_pad_get_negotiated_caps(GST_PAD(self->obj));
-    /* pyg_boxed_new handles NULL checking */
-    return pyg_boxed_new(GST_TYPE_CAPS, ret, TRUE, TRUE);
-}
-%%
-override gst_pad_get_negotiated_caps noargs
-static PyObject *
-_wrap_gst_pad_get_negotiated_caps(PyGObject *self)
-{
-    GstCaps *ret = (GstCaps*)gst_pad_get_negotiated_caps(GST_PAD(self->obj));
-    return pyg_boxed_new(GST_TYPE_CAPS, ret, TRUE, TRUE);
-}
 %%
 override gst_pad_get_pad_template_caps noargs
 static PyObject *