diff --git a/ChangeLog b/ChangeLog
index 1c6725eb1f..fab946a6bb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-10-03  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+	* sys/v4l2/gstv4l2object.c:
+	(gst_v4l2_object_install_properties_helper):
+	  comment out the properties that are already part of the tuner
+	  interface.
+
 2006-10-03  Zaheer Abbas Merali  <zaheerabbas at merali dot org>
 
 	* sys/v4l2/gstv4l2src.c:
diff --git a/sys/v4l2/gstv4l2object.c b/sys/v4l2/gstv4l2object.c
index c7055e6a8c..682915a8ad 100644
--- a/sys/v4l2/gstv4l2object.c
+++ b/sys/v4l2/gstv4l2object.c
@@ -244,6 +244,8 @@ gst_v4l2_object_install_properties_helper (GObjectClass * gobject_class)
   g_object_class_install_property (gobject_class, PROP_FLAGS,
       g_param_spec_flags ("flags", "Flags", "Device type flags",
           GST_TYPE_V4L2_DEVICE_FLAGS, DEFAULT_PROP_FLAGS, G_PARAM_READABLE));
+/* FIXME norm, channel, frequency are part of the tuner interface, so they
+   should be removed from the properties
   g_object_class_install_property (gobject_class, PROP_NORM,
       g_param_spec_string ("norm", "Norm", "Standard norm to use",
           DEFAULT_PROP_NORM, G_PARAM_READWRITE));
@@ -255,6 +257,7 @@ gst_v4l2_object_install_properties_helper (GObjectClass * gobject_class)
       g_param_spec_ulong ("frequency", "Frequency",
           "Frequency to tune to (in Hz)", 0, G_MAXULONG, DEFAULT_PROP_FREQUENCY,
           G_PARAM_READWRITE));
+*/
 }
 
 GstV4l2Object *