diff --git a/ChangeLog b/ChangeLog
index fa8196d417..7c46e5e10c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2005-08-04  Andy Wingo  <wingo@pobox.com>
+
+	* sys/oss/gstossaudio.c (plugin_init): Second-class citizen.
+
+	* gst/videobox/gstvideobox.c (gst_video_box_get_size): Update for
+	API changes.
+
+	* configure.ac (DEFAULT_AUDIOSINK, DEFAULT_VIDEOSINK): Set to
+	autoaudiosink and autovideosink.
+
 2005-08-04  Edward Hervey  <edward@fluendo.com>
 
 	* gst/avi/gstavidemux.c: (gst_avi_demux_reset),
@@ -1064,7 +1074,7 @@
 	UDP fixes, added uri handler.
 	Added rtpdec that will manage the RTP session in the future.
 
-2005-05-10  Arwed v. Merkatz  <v.merkatz@gmx.net>>
+2005-05-10  Arwed v. Merkatz  <v.merkatz@gmx.net>
 
 	* PORTED_09:
 	* configure.ac:
diff --git a/configure.ac b/configure.ac
index 21eb8c88c6..29414606a8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -101,21 +101,17 @@ fi
 dnl Check for FIONREAD ioctl declaration :
 GST_CHECK_FIONREAD()
 
-DEFAULT_AUDIOSINK="osssink"
-DEFAULT_VIDEOSINK="xvimagesink"
-DEFAULT_AUDIOSRC="osssrc"
+DEFAULT_AUDIOSINK="autoaudiosink"
+DEFAULT_VIDEOSINK="autovideosink"
+DEFAULT_AUDIOSRC="alsasrc"
 DEFAULT_VIDEOSRC="v4lsrc"
 DEFAULT_VISUALIZER="goom"
 case "$host" in 
   *-sun-* | *pc-solaris* )
-    DEFAULT_AUDIOSINK="sunaudiosink"
-    DEFAULT_VIDEOSINK="ximagesink"
     DEFAULT_AUDIOSRC="sunaudiosrc"
     ;;
   *-darwin* )
-    DEFAULT_AUDIOSINK="osxaudiosink"
     DEFAULT_AUDIOSRC="osxaudiosrc"
-    DEFAULT_VIDEOSINK="osxvideosink"
     ;;
 esac