diff --git a/audio/mpg321/Makefile b/audio/mpg321/Makefile
index 92645a915bf..f960694ffcf 100644
--- a/audio/mpg321/Makefile
+++ b/audio/mpg321/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.12 2002/12/29 19:29:56 fgsch Exp $
+# $OpenBSD: Makefile,v 1.13 2003/12/10 21:28:58 naddy Exp $
 
 COMMENT=	"free clone of mpg123, a command-line mp3 player"
 
@@ -17,7 +17,8 @@ PERMIT_DISTFILES_FTP=	Yes
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=mpg321/}
 
 LIB_DEPENDS=	ao.3::audio/libao \
-		mad.1,id3tag.1::audio/mad
+		id3tag.2::audio/libid3tag \
+		mad.2::audio/libmad
 
 SEPARATE_BUILD=	concurrent
 CONFIGURE_STYLE=gnu
diff --git a/audio/normalize/Makefile b/audio/normalize/Makefile
index 88692e5dff7..bb3f6ff9e0d 100644
--- a/audio/normalize/Makefile
+++ b/audio/normalize/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 2003/05/13 00:12:37 naddy Exp $
+# $OpenBSD: Makefile,v 1.6 2003/12/10 21:28:58 naddy Exp $
 
 COMMENT=	"audio file volume normalizer"
 
@@ -27,7 +27,7 @@ CONFIGURE_ARGS=	--disable-xmms \
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
-LIB_DEPENDS+=	mad::audio/mad \
+LIB_DEPENDS=	mad.2::audio/libmad \
 		audiofile::devel/libaudiofile
 
 .include <bsd.port.mk>
diff --git a/audio/sox/Makefile b/audio/sox/Makefile
index 63d3f9dc174..58da43a5a69 100644
--- a/audio/sox/Makefile
+++ b/audio/sox/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.24 2003/09/22 22:53:36 pvalchev Exp $
+# $OpenBSD: Makefile,v 1.25 2003/12/10 21:28:58 naddy Exp $
 
 COMMENT=	"SOund eXchange - universal sound sample translator"
 
@@ -32,7 +32,7 @@ CONFIGURE_ARGS+= --disable-ogg-vorbis
 .endif
 
 .if ${FLAVOR:L:Mmp3}
-LIB_DEPENDS+=	mad.1::audio/mad mp3lame.0::audio/lame
+LIB_DEPENDS+=	mad.2::audio/libmad mp3lame.0::audio/lame
 .else
 CONFIGURE_ARGS+= --disable-mad --disable-lame
 .endif
diff --git a/audio/tempest/Makefile b/audio/tempest/Makefile
index 83f69689ed9..b4a094a5e77 100644
--- a/audio/tempest/Makefile
+++ b/audio/tempest/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.9 2003/09/23 15:29:41 sturm Exp $
+# $OpenBSD: Makefile,v 1.10 2003/12/10 21:28:58 naddy Exp $
 
 COMMENT=	"sends AM radio signals using a monitor"
 
@@ -18,7 +18,7 @@ MASTER_SITES=	${HOMEPAGE}
 
 NO_REGRESS=	Yes
 
-RUN_DEPENDS=	:mad-*:audio/mad \
+RUN_DEPENDS=	:madplay-*:audio/madplay \
 		:sox-*:audio/sox
 LIB_DEPENDS=	SDL::devel/sdl
 
diff --git a/audio/wmmp3/Makefile b/audio/wmmp3/Makefile
index 07c9c3cbda7..9c37250c2d7 100644
--- a/audio/wmmp3/Makefile
+++ b/audio/wmmp3/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.11 2003/08/04 13:31:28 wilfried Exp $
+# $OpenBSD: Makefile,v 1.12 2003/12/10 21:28:58 naddy Exp $
 
 COMMENT=		'wm-dockapp; front end for an mp3 player'
 
@@ -17,7 +17,7 @@ PERMIT_DISTFILES_FTP=	Yes
 
 MASTER_SITES=		${HOMEPAGE}
 
-RUN_DEPENDS=		:mad-*:audio/mad
+RUN_DEPENDS=		:madplay-*:audio/madplay
 
 SEPARATE_BUILD=		concurrent
 USE_X11=		Yes
diff --git a/audio/xhippo/Makefile b/audio/xhippo/Makefile
index 915913563aa..556b8d2d908 100644
--- a/audio/xhippo/Makefile
+++ b/audio/xhippo/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.9 2003/06/06 06:06:18 kevlo Exp $
+# $OpenBSD: Makefile,v 1.10 2003/12/10 21:28:58 naddy Exp $
 
 COMMENT=	"generic playlist manager for UNIX"
 
@@ -17,7 +17,7 @@ PERMIT_DISTFILES_FTP=  Yes
 MASTER_SITES=	${MASTER_SITE_GNU:=xhippo/}
 
 LIB_DEPENDS=	gdk_pixbuf_xlib-2.0.0.0::x11/gtk+2 \
-		id3tag.1::audio/mad
+		id3tag.2::audio/libid3tag
 
 USE_X11=	Yes
 CONFIGURE_STYLE= gnu
diff --git a/games/scummvm/Makefile b/games/scummvm/Makefile
index 9a7b99ece89..4f175da1685 100644
--- a/games/scummvm/Makefile
+++ b/games/scummvm/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 2003/08/08 20:12:52 jolan Exp $
+# $OpenBSD: Makefile,v 1.6 2003/12/10 21:28:58 naddy Exp $
 
 COMMENT=	"play games built around LucasArts' SCUMM"
 DISTNAME=	scummvm-0.5.1
@@ -17,7 +17,7 @@ PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
 LIB_DEPENDS=	SDL::devel/sdl \
-		mad::audio/mad \
+		mad.2::audio/libmad \
 		vorbis.0,vorbisfile.1::audio/libvorbis
 
 NO_REGRESS=	Yes
diff --git a/graphics/swfdec/Makefile b/graphics/swfdec/Makefile
index 33d089c4e9c..44a001a7db5 100644
--- a/graphics/swfdec/Makefile
+++ b/graphics/swfdec/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 2003/07/11 07:54:43 jolan Exp $
+# $OpenBSD: Makefile,v 1.4 2003/12/10 21:28:58 naddy Exp $
 
 COMMENT=	"flash rendering library"
 DISTNAME=	swfdec-0.2.2
@@ -18,7 +18,7 @@ PERMIT_PACKAGE_FTP=	Yes
 BUILD_DEPENDS+=	:pkgconfig->=0.12.0p1:devel/pkgconfig
 
 LIB_DEPENDS=	SDL::devel/sdl \
-		mad::audio/mad \
+		mad.2::audio/libmad \
 		art_lgpl_2.5::graphics/libart \
 		gdk-x11-2.0.0.11,gdk_pixbuf-2.0.0.11,gtk-x11-2.0.0.11::x11/gtk+2
 
diff --git a/x11/ogle/Makefile b/x11/ogle/Makefile
index 6e0c83854c7..e2e6aff1cb7 100644
--- a/x11/ogle/Makefile
+++ b/x11/ogle/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.25 2003/11/17 19:56:38 espie Exp $
+# $OpenBSD: Makefile,v 1.26 2003/12/10 21:28:58 naddy Exp $
 
 ONLY_FOR_ARCHS=	alpha i386 powerpc sparc64
 
@@ -24,7 +24,7 @@ LIB_DEPENDS=	a52::audio/liba52 \
 		dvdread.3.0::devel/libdvdread \
 		xml2.6.19:libxml->=2.4.19:textproc/libxml \
 		jpeg.62::graphics/jpeg \
-		mad::audio/mad
+		mad.2::audio/libmad
 
 USE_X11=	Yes
 
diff --git a/x11/vlc/Makefile b/x11/vlc/Makefile
index 0fe9baab75a..785954b821e 100644
--- a/x11/vlc/Makefile
+++ b/x11/vlc/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.8 2003/11/04 07:48:26 jolan Exp $
+# $OpenBSD: Makefile,v 1.9 2003/12/10 21:28:59 naddy Exp $
 
 COMMENT=	"videolan client; multimedia player"
 
@@ -27,7 +27,8 @@ LIB_DEPENDS=	SDL::devel/sdl \
 		gtk.1.2,gdk.1.2::x11/gtk+ \
 		glib,gthread::devel/glib \
 		png::graphics/png \
-		mad.1,id3tag.1::audio/mad \
+		id3tag.2::audio/libid3tag \
+		mad.2::audio/libmad \
 		ogg::audio/libogg \
 		vorbis,vorbisenc::audio/libvorbis \
 		dvbpsi.1.1::graphics/libdvbpsi \