diff --git a/ChangeLog b/ChangeLog
index 9b91ee1f14..88de3c78a3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-12-13  David Schleef  <ds@schleef.org>
+
+	* configure.ac:  Applied patch from bug #143659, making default
+	sources and sinks OS-dependent (for Solaris), and added code
+	for OS/X.
+	* gconf/gstreamer.schemas.in: use OS-dependent sinks in gconf.
+
 2004-12-13  Stephane Loeuillet  <stephane.loeuillet@tiscali.fr>
 
 	* gst-libs/gst/riff/riff-media.c:
diff --git a/configure.ac b/configure.ac
index 2d64fbecdf..725140376d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -100,6 +100,30 @@ fi
 dnl Check for FIONREAD ioctl declaration :
 GST_CHECK_FIONREAD()
 
+DEFAULT_AUDIOSINK="osssink"
+DEFAULT_VIDEOSINK="xvimagesink"
+DEFAULT_AUDIOSRC="osssrc"
+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
+
+AC_SUBST(DEFAULT_AUDIOSINK)
+AC_SUBST(DEFAULT_AUDIOSRC)
+AC_SUBST(DEFAULT_VIDEOSINK)
+AC_SUBST(DEFAULT_VIDEOSRC)
+AC_SUBST(DEFAULT_VISUALIZER)
+
 dnl ############################################
 dnl # Super Duper options for plug-in building #
 dnl ############################################