diff --git a/ChangeLog b/ChangeLog
index 57d62e4c6e..f23a1fd0e7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2003-10-10  David I. Lehn <dlehn@users.sourceforge.net>
+
+	* configure.ac, gstreamer/Makefile.am, gstreamer/*: Mass change to
+	support compiling for both 0.6 and 0.7.  Common support is now in
+	common.{defs,override,c,h}.  Specific version support is in
+	{0.6,0.7}.{defs,override,c,h}.  The common and version specific files
+	are merged and/or used as needed.
+
+	* gstreamer/common.override: add gst_version
+
+	* examples/gstreamer/ilat.py: add annoying version check for 0.6 API
+
 2003-10-09  David I. Lehn <dlehn@users.sourceforge.net>
 
 	* configure.ac: require autoconf 2.57 and pygtk 2.0.0.
diff --git a/examples/gst/ilat.py b/examples/gst/ilat.py
index 8ac7452a1f..0da4799811 100755
--- a/examples/gst/ilat.py
+++ b/examples/gst/ilat.py
@@ -93,7 +93,8 @@ def check(f, n, b):
 
 def main():
     "Identity timer and latency check"
-    gst_debug_set_categories(0L)
+    if gst_version() < (0,7,0):
+        gst_debug_set_categories(0L)
 
     if len(sys.argv) < 3:
         print 'usage: %s identites buffers' % (sys.argv[0],)
diff --git a/examples/gstreamer/ilat.py b/examples/gstreamer/ilat.py
index 8ac7452a1f..0da4799811 100755
--- a/examples/gstreamer/ilat.py
+++ b/examples/gstreamer/ilat.py
@@ -93,7 +93,8 @@ def check(f, n, b):
 
 def main():
     "Identity timer and latency check"
-    gst_debug_set_categories(0L)
+    if gst_version() < (0,7,0):
+        gst_debug_set_categories(0L)
 
     if len(sys.argv) < 3:
         print 'usage: %s identites buffers' % (sys.argv[0],)