diff --git a/ChangeLog b/ChangeLog
index d4940cf507..d14bbcf0a5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-10-03  Tim-Philipp Müller  <tim at centricular dot net>
+
+	* gst/gstclock.h:
+	  Fix up broken GST_CLOCK_FLAGS macro and GstClock docs. The flags
+	  field has moved to GstObject.
+
 2007-10-02  Wim Taymans  <wim.taymans@gmail.com>
 
 	* libs/gst/base/gstbasesrc.c: (gst_base_src_do_sync),
diff --git a/gst/gstclock.h b/gst/gstclock.h
index 7cdbb33a25..bc7a9aa92b 100644
--- a/gst/gstclock.h
+++ b/gst/gstclock.h
@@ -338,7 +338,7 @@ typedef enum {
  *
  * Gets the #GstClockFlags clock flags.
  */
-#define GST_CLOCK_FLAGS(clock)  (GST_CLOCK(clock)->flags)
+#define GST_CLOCK_FLAGS(clock)  GST_OBJECT_FLAGS(clock)
 
 /**
  * GST_CLOCK_COND:
@@ -374,7 +374,6 @@ typedef enum {
 
 /**
  * GstClock:
- * @flags: The flags specifying the capabilities of the clock.
  *
  * GstClock base structure. The values of this structure are
  * protected for subclasses, use the methods to use the #GstClock.