diff --git a/multimedia/gstreamer-0.10/core/Makefile b/multimedia/gstreamer-0.10/core/Makefile
index c624b10e4a4..62788142ae3 100644
--- a/multimedia/gstreamer-0.10/core/Makefile
+++ b/multimedia/gstreamer-0.10/core/Makefile
@@ -1,12 +1,10 @@
-# $OpenBSD: Makefile,v 1.9 2009/04/11 14:37:21 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.10 2009/04/16 11:40:45 ajacoutot Exp $
 
-COMMENT-main =		streaming media framework - core
-COMMENT-frontend =	streaming media framework - frontend commands
+COMMENT =		streaming media framework - core
 
 V =			0.10.19
 
-PKGNAME-main =		gstreamer-$Vp2
-PKGNAME-frontend =	gstreamer-frontend-$Vp2
+PKGNAME =		gstreamer-$Vp3
 
 DISTNAME =		gstreamer-$V
 
@@ -15,23 +13,15 @@ SHARED_LIBS +=	gstbase-0.10          0.2     # .11.0
 SHARED_LIBS +=	gstcontroller-0.10    1.0     # .11.0
 SHARED_LIBS +=	gstdataprotocol-0.10  0.0     # .11.0
 SHARED_LIBS +=	gstnet-0.10           0.1     # .11.0
-#SHARED_LIBS +=  gstcheck-0.10         0.0     # .16.0
+
+WANTLIB += c m pcre pthread z
 
 MASTER_SITES =		${MASTER_SITE_GST:=gstreamer/}
 
-MULTI_PACKAGES =	-main -frontend
-WANTLIB =		m pcre z
 MODULES =		devel/gettext
 
-LIB_DEPENDS =		glib-2.0.>=200.0,gmodule-2.0,gobject-2.0,gthread-2.0::devel/glib2
-
-WANTLIB-frontend =	${WANTLIB} c pthread xml2
-
-LIB_DEPENDS-main =	${LIB_DEPENDS} \
-			xml2.>=6::textproc/libxml
-
-LIB_DEPENDS-frontend =	${LIB_DEPENDS} \
-			gstreamer-0.10::multimedia/gstreamer-0.10/core,-main
+LIB_DEPENDS =		xml2.>=6::textproc/libxml \
+			glib-2.0.>=1800,gmodule-2.0,gobject-2.0,gthread-2.0::devel/glib2
 
 CONFIGURE_ARGS =	--without-check
 
diff --git a/multimedia/gstreamer-0.10/core/pkg/DESCR-main b/multimedia/gstreamer-0.10/core/pkg/DESCR
similarity index 76%
rename from multimedia/gstreamer-0.10/core/pkg/DESCR-main
rename to multimedia/gstreamer-0.10/core/pkg/DESCR
index 17b834f1775..8663b145bc6 100644
--- a/multimedia/gstreamer-0.10/core/pkg/DESCR-main
+++ b/multimedia/gstreamer-0.10/core/pkg/DESCR
@@ -4,6 +4,3 @@ from real-time sound processing to playing videos, and just about anything
 else media-related.  Its plugin-based architecture means that new data
 types or processing capabilities can be added simply by installing new 
 plugins.
-
-Some command-line utilities have been moved into gstreamer-frontend
-to facilitate the transition to gstreamer-0.10
diff --git a/multimedia/gstreamer-0.10/core/pkg/DESCR-frontend b/multimedia/gstreamer-0.10/core/pkg/DESCR-frontend
deleted file mode 100644
index 4d7abe389dd..00000000000
--- a/multimedia/gstreamer-0.10/core/pkg/DESCR-frontend
+++ /dev/null
@@ -1,8 +0,0 @@
-GStreamer is a streaming-media framework, based on graphs of filters which
-operate on media data.   This package contains front-ends to the other
-programs.
-
-These binaries were split out so that people can install both gstreamer-0.8
-and gstreamer-0.10. The front-end know about version numbers, so you can
-install whatever version is most convenient, and have it use the correct
-gstreamer subsystem by saying e.g., gst-launch --gst-mm=0.8
diff --git a/multimedia/gstreamer-0.10/core/pkg/PLIST-main b/multimedia/gstreamer-0.10/core/pkg/PLIST
similarity index 92%
rename from multimedia/gstreamer-0.10/core/pkg/PLIST-main
rename to multimedia/gstreamer-0.10/core/pkg/PLIST
index 00417efa193..ae50e20d305 100644
--- a/multimedia/gstreamer-0.10/core/pkg/PLIST-main
+++ b/multimedia/gstreamer-0.10/core/pkg/PLIST
@@ -1,6 +1,19 @@
-@comment $OpenBSD: PLIST-main,v 1.4 2009/04/11 14:37:21 ajacoutot Exp $
-@option no-default-conflict
-@conflict gstreamer->=0.10
+@comment $OpenBSD: PLIST,v 1.1 2009/04/16 11:40:45 ajacoutot Exp $
+@conflict gstreamer-frontend-*
+@conflict gstreamer->=0.8,<0.10
+@pkgpath multimedia/gstreamer-0.10/core,-main
+@bin bin/gst-feedback
+bin/gst-feedback-${VERSION}
+@bin bin/gst-inspect
+@bin bin/gst-inspect-${VERSION}
+@bin bin/gst-launch
+@bin bin/gst-launch-${VERSION}
+@bin bin/gst-typefind
+@bin bin/gst-typefind-${VERSION}
+@bin bin/gst-xmlinspect
+@bin bin/gst-xmlinspect-${VERSION}
+@bin bin/gst-xmllaunch
+@bin bin/gst-xmllaunch-${VERSION}
 include/gstreamer-${VERSION}/
 include/gstreamer-${VERSION}/gst/
 include/gstreamer-${VERSION}/gst/base/
@@ -104,8 +117,6 @@ lib/pkgconfig/gstreamer-net-${VERSION}.pc
 @man man/man1/gst-xmlinspect-${VERSION}.1
 @man man/man1/gst-xmllaunch-${VERSION}.1
 share/aclocal/gst-element-check-${VERSION}.m4
-share/gtk-doc/
-share/gtk-doc/html/
 share/gtk-doc/html/gstreamer-${VERSION}/
 share/gtk-doc/html/gstreamer-libs-${VERSION}/
 share/gtk-doc/html/gstreamer-plugins-${VERSION}/
diff --git a/multimedia/gstreamer-0.10/core/pkg/PLIST-frontend b/multimedia/gstreamer-0.10/core/pkg/PLIST-frontend
deleted file mode 100644
index 67c0d28cc81..00000000000
--- a/multimedia/gstreamer-0.10/core/pkg/PLIST-frontend
+++ /dev/null
@@ -1,13 +0,0 @@
-@comment $OpenBSD: PLIST-frontend,v 1.2 2009/04/11 14:37:21 ajacoutot Exp $
-@bin bin/gst-feedback
-bin/gst-feedback-${VERSION}
-@bin bin/gst-inspect
-@bin bin/gst-inspect-${VERSION}
-@bin bin/gst-launch
-@bin bin/gst-launch-${VERSION}
-@bin bin/gst-typefind
-@bin bin/gst-typefind-${VERSION}
-@bin bin/gst-xmlinspect
-@bin bin/gst-xmlinspect-${VERSION}
-@bin bin/gst-xmllaunch
-@bin bin/gst-xmllaunch-${VERSION}