diff --git a/ChangeLog b/ChangeLog
index f6c68717bc..f2051a4802 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2005-11-14  Andy Wingo  <wingo@pobox.com>
 
+	* gst/gstpad.c (gst_pad_set_active): Change docs; parent's
+	STATE_LOCK not necessary. Fixes #311489.
+
 	* gst/gsterror.c (FILE_A_BUG): Be polite *and* helpful. Fixes
 	#305291.
 
diff --git a/gst/gstpad.c b/gst/gstpad.c
index 17bbd5fec0..af7c683aae 100644
--- a/gst/gstpad.c
+++ b/gst/gstpad.c
@@ -576,7 +576,6 @@ post_activate (GstPad * pad, GstActivateMode new_mode)
  * @active: whether or not the pad should be active.
  *
  * Activates or deactivates the given pad.
- * Must be called with the parent element's #GST_STATE_LOCK held.
  * Normally called from within core state change functions.
  *
  * If @active, makes sure the pad is active. If it is already active, either in
@@ -589,7 +588,7 @@ post_activate (GstPad * pad, GstActivateMode new_mode)
  *
  * Returns: #TRUE if the operation was successful.
  *
- * MT safe. Must be called with parent element's #GST_STATE_LOCK held.
+ * MT safe.
  */
 gboolean
 gst_pad_set_active (GstPad * pad, gboolean active)