diff --git a/ChangeLog b/ChangeLog
index 2332cb9b9099baa4d0eb474ebde6b9183763056b..ea7fe5aa57a6a2a3b261bf9865a170a9f9e9d4d4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-03-06  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+	* gst/gstclock.h:
+	  Show GST_CLOCK_TIME_NONE as 99:99:99.999999999
+
 2006-03-05  Tim-Philipp Müller  <tim at centricular dot net>
 
 	* libs/gst/base/gstbasetransform.c:
diff --git a/gst/gstclock.h b/gst/gstclock.h
index b84457777d28d2da9375d1c0c391c473c529e248..3e8b0757e688631be2677dfc50ba294b2dd6f8b8 100644
--- a/gst/gstclock.h
+++ b/gst/gstclock.h
@@ -177,10 +177,14 @@ G_STMT_START {						\
  * Format @t for the GST_TIME_FORMAT format string.
  */
 #define GST_TIME_ARGS(t) \
-        (guint) (((GstClockTime)(t)) / (GST_SECOND * 60 * 60)), \
-        (guint) ((((GstClockTime)(t)) / (GST_SECOND * 60)) % 60), \
-        (guint) ((((GstClockTime)(t)) / GST_SECOND) % 60), \
-        (guint) (((GstClockTime)(t)) % GST_SECOND)
+        GST_CLOCK_TIME_IS_VALID (t) ? \
+        (guint) (((GstClockTime)(t)) / (GST_SECOND * 60 * 60)) : 99, \
+        GST_CLOCK_TIME_IS_VALID (t) ? \
+        (guint) ((((GstClockTime)(t)) / (GST_SECOND * 60)) % 60) : 99, \
+        GST_CLOCK_TIME_IS_VALID (t) ? \
+        (guint) ((((GstClockTime)(t)) / GST_SECOND) % 60) : 99, \
+        GST_CLOCK_TIME_IS_VALID (t) ? \
+        (guint) (((GstClockTime)(t)) % GST_SECOND) : 999999999
 
 /**
  * GST_CLOCK_ENTRY_TRACE_NAME: