diff --git a/multimedia/gstreamer-0.10/core/Makefile b/multimedia/gstreamer-0.10/core/Makefile
index 99ea0f72705..5bab0a948c0 100644
--- a/multimedia/gstreamer-0.10/core/Makefile
+++ b/multimedia/gstreamer-0.10/core/Makefile
@@ -1,9 +1,12 @@
-# $OpenBSD: Makefile,v 1.1 2007/01/08 17:39:53 espie Exp $
+# $OpenBSD: Makefile,v 1.2 2007/01/09 20:43:46 espie Exp $
 
 COMMENT-main=		"streaming media framework - core"
 COMMENT-frontend=	"streaming media framework - frontend commands"
 
-PKGNAME-frontend=	gstreamer-frontend-0.10.11
+V=			0.10.11
+
+PKGNAME-main=		gstreamer-$V
+PKGNAME-frontend=	gstreamer-frontend-$V
 
 DISTNAME=		gstreamer-0.10.11
 
diff --git a/multimedia/gstreamer-0.10/plugins-base/Makefile b/multimedia/gstreamer-0.10/plugins-base/Makefile
index b97fae7b865..da30061decc 100644
--- a/multimedia/gstreamer-0.10/plugins-base/Makefile
+++ b/multimedia/gstreamer-0.10/plugins-base/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 2007/01/09 20:00:23 espie Exp $
+# $OpenBSD: Makefile,v 1.4 2007/01/09 20:43:46 espie Exp $
 
 COMMENT-main=		"multimedia framework - plugins base"
 COMMENT-gnome=		"multimedia framework - gnome vfs plugin"
@@ -49,9 +49,10 @@ LIB_DEPENDS-gnome= 	${LIB_DEPENDS} \
 			gnomevfs-2::x11/gnome/vfs2
 
 WANTLIB-cdda=		${WANTLIB} \
-			cdda_interface cdda_paranoia gstbase-0.10
+			gstbase-0.10
 LIB_DEPENDS-cdda= 	${LIB_DEPENDS} \
-			gsttag-0.10::${BUILD_PKGPATH}
+			gsttag-0.10::${BUILD_PKGPATH} \
+			cdda_interface,cdda_paranoia::audio/cdparanoia
 
 WANTLIB-ogg=		${WANTLIB} \
 			gstbase-0.10