diff --git a/ChangeLog b/ChangeLog
index eab5369f40..5dfd1442e2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2006-06-28  Tim-Philipp Müller  <tim at centricular dot net>
+
+	Patch by: Brian Cameron  <brian dot cameron at sun dot com>
+
+	* sys/sunaudio/gstsunaudiosink.c: (gst_sunaudiosink_prepare):
+	  Do not modify the ports value. If the user has turned off the
+	  built-in speakers, then we should not reset it in the prepare
+	  function, since this causes the built-in speakers to turn
+	  back on anytime the user changes a track in totem, rhythmbox,
+	  etc. (#346066).
+
 2006-06-23  Wim Taymans  <wim@fluendo.com>
 
 	* gst/goom/gstgoom.c: (gst_goom_src_negotiate):
diff --git a/sys/sunaudio/gstsunaudiosink.c b/sys/sunaudio/gstsunaudiosink.c
index 7dd56d60fd..5c6e48f76b 100644
--- a/sys/sunaudio/gstsunaudiosink.c
+++ b/sys/sunaudio/gstsunaudiosink.c
@@ -330,9 +330,6 @@ gst_sunaudiosink_prepare (GstAudioSink * asink, GstRingBufferSpec * spec)
     return FALSE;
 
   ports = ainfo.play.port;
-  if (!(ports & AUDIO_SPEAKER) && (ainfo.play.avail_ports & AUDIO_SPEAKER)) {
-    ports = ports | AUDIO_SPEAKER;
-  }
 
   AUDIO_INITINFO (&ainfo);