diff --git a/ChangeLog b/ChangeLog
index bc2406e6e5..5719de3982 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2004-06-29  Benjamin Otte  <otte@gnome.org>
+
+	* sys/oss/gstosssink.c:
+	* sys/oss/gstosssrc.c:
+	  advertise correct template caps - we indeed do non-native endianness
+	  and 8bit audio has no endianness
+	* sys/ximage/ximagesink.c: (gst_ximagesink_getcaps):
+	* sys/xvimage/xvimagesink.c: (gst_xvimagesink_getcaps):
+	  avoid (wrong) duplications in getcaps function and return
+	  template caps
+
 2004-06-29  Wim Taymans  <wim@fluendo.com>
 
 	* gst/tcp/gstmultifdsink.c: (gst_recover_policy_get_type),
diff --git a/sys/ximage/ximagesink.c b/sys/ximage/ximagesink.c
index af6eff36a7..538996e864 100644
--- a/sys/ximage/ximagesink.c
+++ b/sys/ximage/ximagesink.c
@@ -787,9 +787,7 @@ gst_ximagesink_getcaps (GstPad * pad)
   if (ximagesink->xcontext)
     return gst_caps_copy (ximagesink->xcontext->caps);
 
-  return gst_caps_from_string ("video/x-raw-rgb, "
-      "framerate = (double) [ 1, 100 ], "
-      "width = (int) [ 0, MAX ], " "height = (int) [ 0, MAX ]");
+  return gst_caps_copy (gst_pad_get_pad_template_caps (pad));
 }
 
 static GstPadLinkReturn
diff --git a/sys/xvimage/xvimagesink.c b/sys/xvimage/xvimagesink.c
index 845ff556c6..0c940fdba8 100644
--- a/sys/xvimage/xvimagesink.c
+++ b/sys/xvimage/xvimagesink.c
@@ -1058,13 +1058,7 @@ gst_xvimagesink_getcaps (GstPad * pad)
   if (xvimagesink->xcontext)
     return gst_caps_copy (xvimagesink->xcontext->caps);
 
-  return gst_caps_from_string ("video/x-raw-rgb, "
-      "framerate = (double) [ 1.0, 100.0 ], "
-      "width = (int) [ 0, MAX ], "
-      "height = (int) [ 0, MAX ]; "
-      "video/x-raw-yuv, "
-      "framerate = (double) [ 0, MAX ], "
-      "width = (int) [ 0, MAX ], " "height = (int) [ 0, MAX ]");
+  return gst_caps_copy (gst_pad_get_pad_template_caps (pad));
 }
 
 static GstPadLinkReturn