diff --git a/ChangeLog b/ChangeLog
index 9c04b8f0bd..691ce8f9bf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-10-20  Tim-Philipp Müller  <tim at centricular dot net>
+
+	* gst/audiotestsrc/gstaudiotestsrc.c: (gst_audiotestsrc_src_query):
+	* gst/sine/gstsinesrc.c: (gst_sinesrc_src_query):
+	  Don't use functions for position queries when handling
+	  duration queries.
+
 2005-10-20  Tim-Philipp Müller  <tim at centricular dot net>
 
 	* ext/vorbis/vorbisdec.c: (vorbis_dec_sink_event),
diff --git a/gst/audiotestsrc/gstaudiotestsrc.c b/gst/audiotestsrc/gstaudiotestsrc.c
index 2de2551fea..9eeaa7cd06 100644
--- a/gst/audiotestsrc/gstaudiotestsrc.c
+++ b/gst/audiotestsrc/gstaudiotestsrc.c
@@ -282,7 +282,7 @@ gst_audiotestsrc_src_query (GstPad * pad, GstQuery * query)
       GstFormat format;
 
       /* unlimited length */
-      gst_query_parse_position (query, &format, NULL);
+      gst_query_parse_duration (query, &format, NULL);
       gst_query_set_duration (query, format, -1);
       break;
     }
diff --git a/gst/sine/gstsinesrc.c b/gst/sine/gstsinesrc.c
index ce04be1a7b..e6018663a7 100644
--- a/gst/sine/gstsinesrc.c
+++ b/gst/sine/gstsinesrc.c
@@ -229,8 +229,8 @@ gst_sinesrc_src_query (GstPad * pad, GstQuery * query)
     {
       GstFormat format;
 
-      gst_query_parse_position (query, &format, NULL);
-      gst_query_set_position (query, format, -1);
+      gst_query_parse_duration (query, &format, NULL);
+      gst_query_set_duration (query, format, -1);
       break;
     }
     default: