diff --git a/multimedia/gstreamer-0.10/plugins-good/Makefile b/multimedia/gstreamer-0.10/plugins-good/Makefile
index 4cdb72a1346..4e51a54e5a8 100644
--- a/multimedia/gstreamer-0.10/plugins-good/Makefile
+++ b/multimedia/gstreamer-0.10/plugins-good/Makefile
@@ -1,9 +1,8 @@
-# $OpenBSD: Makefile,v 1.62 2010/09/30 07:21:20 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.63 2010/09/30 13:46:06 ajacoutot Exp $
 
 COMMENT-main =		good elements for GStreamer
 COMMENT-aalib =		aalib element for GStreamer (plugins-good)
 COMMENT-dv =		dv element for GStreamer (plugins-good)
-COMMENT-gdk =		gdk pixbuf element for GStreamer (plugins-good)
 COMMENT-caca =		libcaca element for GStreamer (plugins-good)
 
 V =			0.10.25
@@ -12,15 +11,14 @@ DISTNAME =		gst-plugins-good-$V
 PKGNAME-main =		gstreamer-plugins-good-${V}
 PKGNAME-aalib =		gstreamer-aalib-${V}
 PKGNAME-dv =		gstreamer-dv-${V}
-PKGNAME-gdk =		gstreamer-gdk-pixbuf-${V}
 PKGNAME-caca =		gstreamer-libcaca-${V}
 
-REVISION-main =		0
+REVISION-main =		1
 EPOCH-main =		0
-REVISION-gdk =		0
+REVISION-caca =		0
 
 MULTI_PACKAGES =	-main -aalib \
-			-dv -gdk -caca
+			-dv -caca
 
 MASTER_SITES =		${MASTER_SITE_GST:=gst-plugins-good/}
 
@@ -40,7 +38,7 @@ WANTLIB =		glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0 \
 			pcre xml2 m z gstreamer-0.10 gstbase-0.10
 LIB_DEPENDS =		:gstreamer->=0.10.30:$P/core
 
-WANTLIB-main =		${WANTLIB} \
+WANTLIB-main =		${WANTLIB} gdk_pixbuf-2.0 \
 			ICE SM X11 Xdamage Xext Xfixes sndio ossaudio \
 			gstcontroller-0.10 Xau Xdmcp xcb-render xcb-render-util \
 			pthread-stubs xcb Xrender cairo expat orc-0.4 \
@@ -64,7 +62,9 @@ LIB_DEPENDS-main =	${LIB_DEPENDS} \
 			::$P/plugins-base \
 			::net/libshout \
 			::archivers/bzip2 \
-			::devel/libsoup,-gnome
+			::devel/libsoup,-gnome \
+			::graphics/gdk-pixbuf2 \
+			::devel/eggdbus
 RUN_DEPENDS-main =	${MODGCONF2_RUN_DEPENDS} \
 			${MODGETTEXT_RUN_DEPENDS}
 
@@ -78,14 +78,8 @@ LIB_DEPENDS-dv =	${LIB_DEPENDS} \
 			::multimedia/libdv \
 			::${P}/plugins-base
 
-WANTLIB-gdk =		${WANTLIB} \
-			gio-2.0 gdk_pixbuf-2.0 gstvideo-0.10
-LIB_DEPENDS-gdk =	${LIB_DEPENDS} \
-			::graphics/gdk-pixbuf2 \
-			::$P/plugins-base
-
 WANTLIB-caca =		${WANTLIB} \
-			X11 ncurses Xau Xdmcp pthread-stubs xcb caca
+			X11 ncursesw Xau Xdmcp pthread-stubs xcb caca
 LIB_DEPENDS-caca =	${LIB_DEPENDS} \
 			::graphics/libcaca
 
diff --git a/multimedia/gstreamer-0.10/plugins-good/pkg/DESCR-gdk b/multimedia/gstreamer-0.10/plugins-good/pkg/DESCR-gdk
deleted file mode 100644
index 408fb63a049..00000000000
--- a/multimedia/gstreamer-0.10/plugins-good/pkg/DESCR-gdk
+++ /dev/null
@@ -1 +0,0 @@
-This package contains the "gdkpixbuf" element for gstreamer-${VERSION} (good).
diff --git a/multimedia/gstreamer-0.10/plugins-good/pkg/PLIST-main b/multimedia/gstreamer-0.10/plugins-good/pkg/PLIST-main
index 39149e31ad4..e294930d517 100644
--- a/multimedia/gstreamer-0.10/plugins-good/pkg/PLIST-main
+++ b/multimedia/gstreamer-0.10/plugins-good/pkg/PLIST-main
@@ -1,10 +1,11 @@
-@comment $OpenBSD: PLIST-main,v 1.24 2010/09/03 15:48:14 ajacoutot Exp $
+@comment $OpenBSD: PLIST-main,v 1.25 2010/09/30 13:46:06 ajacoutot Exp $
 @conflict gstreamer-plugins-bad-<0.10.18
 @conflict gstreamer-jpeg-*
 @conflict gstreamer-png-*
 @conflict gstreamer-cairo-*
 @conflict gstreamer-confelements-*
 @conflict gstreamer-flac-*
+@conflict gstreamer-gdk-pixbuf-*
 @conflict gstreamer-shout-*
 @conflict gstreamer-libsoup-*
 @conflict gstreamer-speex-*
@@ -14,6 +15,7 @@
 @pkgpath ${BASE_PKGPATH},-png
 @pkgpath ${BASE_PKGPATH},-cairo
 @pkgpath ${BASE_PKGPATH},-gconf
+@pkgpath ${BASE_PKGPATH},-gdk
 @pkgpath ${BASE_PKGPATH},-flac
 @pkgpath ${BASE_PKGPATH},-shout
 @pkgpath ${BASE_PKGPATH},-soup
@@ -60,6 +62,8 @@ lib/gstreamer-${VERSION}/libgstflv.so
 lib/gstreamer-${VERSION}/libgstflxdec.so
 @comment lib/gstreamer-${VERSION}/libgstgconfelements.la
 lib/gstreamer-${VERSION}/libgstgconfelements.so
+@comment lib/gstreamer-${VERSION}/libgstgdkpixbuf.la
+lib/gstreamer-${VERSION}/libgstgdkpixbuf.so
 @comment lib/gstreamer-${VERSION}/libgstgoom.la
 lib/gstreamer-${VERSION}/libgstgoom.so
 @comment lib/gstreamer-${VERSION}/libgstgoom2k1.la