diff --git a/multimedia/gstreamer-0.10/plugins-good/Makefile b/multimedia/gstreamer-0.10/plugins-good/Makefile
index 068322a38bd..45f0eec998e 100644
--- a/multimedia/gstreamer-0.10/plugins-good/Makefile
+++ b/multimedia/gstreamer-0.10/plugins-good/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.25 2008/11/03 23:24:08 jakemsr Exp $
+# $OpenBSD: Makefile,v 1.26 2009/01/16 02:44:17 jakemsr Exp $
 
 COMMENT-main =		multimedia framework - good plugins
 COMMENT-aalib =		multimedia framework - aalib plugin
@@ -18,7 +18,7 @@ COMMENT-soup =		multimedia framework - libsoup plugin
 
 V =			0.10.8
 DISTNAME =		gst-plugins-good-$V
-PKGNAME-main =		gstreamer-plugins-good-$Vp5
+PKGNAME-main =		gstreamer-plugins-good-$Vp6
 PKGNAME-aalib =		gstreamer-aalib-$Vp0
 PKGNAME-cairo =		gstreamer-cairo-$Vp1
 PKGNAME-gconf =		gstreamer-confelements-$Vp0
@@ -34,7 +34,6 @@ PKGNAME-caca =		gstreamer-libcaca-$Vp0
 PKGNAME-shout =		gstreamer-shoutcast-$Vp0
 PKGNAME-soup =		gstreamer-libsoup-$Vp0
 
-
 MULTI_PACKAGES =	-main -aalib -cairo -gconf -esd -flac -speex \
 			-taglib -dv -jpeg -png -gdk -caca -shout -soup
 SHARED_LIBS =
@@ -50,7 +49,7 @@ WANTLIB =		glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0 \
 LIB_DEPENDS =		gstreamer-0.10:gstreamer->=0.10:$P/core
 
 WANTLIB-main =		${WANTLIB} \
-			ICE SM X11 Xdamage Xext Xfixes ossaudio sndio \
+			ICE SM X11 Xdamage Xext Xfixes sndio \
 			gstcontroller-0.10 gstbase-0.10 Xau Xdmcp
 LIB_DEPENDS-main =	${LIB_DEPENDS} \
 			oil-0.3::devel/liboil \
@@ -69,12 +68,12 @@ LIB_DEPENDS-cairo =	${LIB_DEPENDS} \
 			cairo::graphics/cairo
 
 WANTLIB-gconf =		${WANTLIB} \
-			ORBit-2
+			ORBit-2 dbus-1 dbus-glib-1
 LIB_DEPENDS-gconf =	${LIB_DEPENDS} \
 			gconf-2::devel/gconf2
 
 WANTLIB-esd =		${WANTLIB} \
-			audiofile gstbase-0.10
+			audiofile gstbase-0.10 sndio
 
 LIB_DEPENDS-esd=	${LIB_DEPENDS} \
 			esd::audio/esound \
@@ -120,7 +119,7 @@ LIB_DEPENDS-png =	${LIB_DEPENDS} \
 
 WANTLIB-gdk =		${WANTLIB} \
 			X11 Xcomposite Xdamage Xext Xrender atk-1.0 \
-			cairo fontconfig freetype glitz pango-1.0 \
+			cairo fontconfig freetype gio-2.0 glitz pango-1.0 \
 			pangocairo-1.0 pangoft2-1.0 pixman-1 png gstbase-0.10 \
 			Xau Xcursor Xdmcp Xfixes Xi Xinerama Xrandr expat
 
diff --git a/multimedia/gstreamer-0.10/plugins-good/files/libsndiosink.c b/multimedia/gstreamer-0.10/plugins-good/files/libsndiosink.c
index 16b896704b4..5d629466a26 100644
--- a/multimedia/gstreamer-0.10/plugins-good/files/libsndiosink.c
+++ b/multimedia/gstreamer-0.10/plugins-good/files/libsndiosink.c
@@ -383,7 +383,7 @@ gst_libsndiosink_prepare (GstAudioSink * asink, GstRingBufferSpec * spec)
 
   spec_bpf = ((spec->width / 8) * spec->channels);
 
-  par.bufsz = (spec->segsize * spec->segtotal) / spec_bpf;
+  par.appbufsz = (spec->segsize * spec->segtotal) / spec_bpf;
 
   if (!sio_setpar(libsndiosink->hdl, &par))
     goto cannot_configure;
diff --git a/multimedia/gstreamer-0.10/plugins-good/files/libsndiosrc.c b/multimedia/gstreamer-0.10/plugins-good/files/libsndiosrc.c
index 03cf295783c..4f3043d5108 100644
--- a/multimedia/gstreamer-0.10/plugins-good/files/libsndiosrc.c
+++ b/multimedia/gstreamer-0.10/plugins-good/files/libsndiosrc.c
@@ -383,7 +383,7 @@ gst_libsndiosrc_prepare (GstAudioSrc * asrc, GstRingBufferSpec * spec)
   spec_bpf = ((spec->width / 8) * spec->channels);
 
   par.round = spec->segsize / spec_bpf;
-  par.bufsz = (spec->segsize * spec->segtotal) / spec_bpf;
+  par.appbufsz = (spec->segsize * spec->segtotal) / spec_bpf;
 
   if (!sio_setpar(libsndiosrc->hdl, &par))
     goto cannot_configure;
diff --git a/multimedia/gstreamer-0.10/plugins-good/pkg/DESCR-main b/multimedia/gstreamer-0.10/plugins-good/pkg/DESCR-main
index c3e4f18e08e..76a101c40cc 100644
--- a/multimedia/gstreamer-0.10/plugins-good/pkg/DESCR-main
+++ b/multimedia/gstreamer-0.10/plugins-good/pkg/DESCR-main
@@ -33,7 +33,7 @@ dependencies.
 * mulaw           MuLaw audio encoder/decoder
 * multipart       multipart stream manipulation (mux/demux)
 * navigationtest  Template for a navigation video filter
-* ossaudio        default audio sink on OpenBSD.
+* libsndio        default audio sink on OpenBSD
 * rtp             Real-time protocol plugins: asterisk, rtp, gsm, h263...
 * rtsp            transfer data via RTSP
 * smpte           Apply the standard SMPTE transitions on video images
diff --git a/multimedia/gstreamer-0.10/plugins-good/pkg/PLIST-main b/multimedia/gstreamer-0.10/plugins-good/pkg/PLIST-main
index 2541ac46c0f..a3a061d626f 100644
--- a/multimedia/gstreamer-0.10/plugins-good/pkg/PLIST-main
+++ b/multimedia/gstreamer-0.10/plugins-good/pkg/PLIST-main
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST-main,v 1.9 2008/11/03 23:24:09 jakemsr Exp $
+@comment $OpenBSD: PLIST-main,v 1.10 2009/01/16 02:44:17 jakemsr Exp $
 @conflict gstreamer-plugins-bad-<0.10.7
 lib/gstreamer-${VERSION}/libgstalaw.la
 lib/gstreamer-${VERSION}/libgstalaw.so
@@ -48,8 +48,8 @@ lib/gstreamer-${VERSION}/libgstmultifile.la
 lib/gstreamer-${VERSION}/libgstmultifile.so
 lib/gstreamer-${VERSION}/libgstmultipart.la
 lib/gstreamer-${VERSION}/libgstmultipart.so
-lib/gstreamer-${VERSION}/libgstossaudio.la
-lib/gstreamer-${VERSION}/libgstossaudio.so
+@comment lib/gstreamer-${VERSION}/libgstossaudio.la
+@comment lib/gstreamer-${VERSION}/libgstossaudio.so
 lib/gstreamer-${VERSION}/libgstqtdemux.la
 lib/gstreamer-${VERSION}/libgstqtdemux.so
 lib/gstreamer-${VERSION}/libgstrtp.la