diff --git a/ChangeLog b/ChangeLog
index fc3c2f5bd6..7ed8f3ac1d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-05-18  Ronald S. Bultje  <rbultje@ronald.bitfreak.net>
+
+	* gst/gstbin.c: (gst_bin_add_func):
+	  Fix clock settery in bins when adding kids after the clock has
+	  been selected.
+
 2005-05-18  Ronald S. Bultje  <rbultje@ronald.bitfreak.net>
 
 	* gst/elements/gstidentity.c: (gst_identity_class_init):
diff --git a/gst/gstbin.c b/gst/gstbin.c
index b698827c80..abb80f9164 100644
--- a/gst/gstbin.c
+++ b/gst/gstbin.c
@@ -391,6 +391,7 @@ gst_bin_add_func (GstBin * bin, GstElement * element)
   gst_element_set_manager (element, GST_ELEMENT (bin)->manager);
   gst_element_set_bus (element, GST_ELEMENT (bin)->bus);
   gst_element_set_scheduler (element, GST_ELEMENT_SCHEDULER (bin));
+  gst_element_set_clock (element, GST_ELEMENT_CLOCK (bin));
 
   GST_UNLOCK (bin);