diff --git a/audio/Makefile b/audio/Makefile
index 4ecb6db8989..ba0025c89c8 100644
--- a/audio/Makefile
+++ b/audio/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.105 2003/12/09 02:35:36 margarida Exp $
+# $OpenBSD: Makefile,v 1.106 2003/12/10 21:31:54 naddy Exp $
 # $FreeBSD: Makefile,v 1.40 1997/11/16 22:49:20 fenner Exp $
 
      SUBDIR += abcde
@@ -31,6 +31,8 @@
      SUBDIR += liba52
      SUBDIR += libao,
      SUBDIR += libcdaudio
+     SUBDIR += libid3tag
+     SUBDIR += libmad
      SUBDIR += libmikmod
      SUBDIR += libmikmod,esd
      SUBDIR += libogg
@@ -39,7 +41,7 @@
      SUBDIR += libvorbis
      SUBDIR += libworkman
      SUBDIR += lopster
-     SUBDIR += mad
+     SUBDIR += madplay
 #    SUBDIR += maplay
 #    SUBDIR += mikmod
      SUBDIR += mixer.app
diff --git a/audio/mad/Makefile b/audio/mad/Makefile
deleted file mode 100644
index 6dd4d454a9e..00000000000
--- a/audio/mad/Makefile
+++ /dev/null
@@ -1,56 +0,0 @@
-# $OpenBSD: Makefile,v 1.10 2002/12/29 19:29:56 fgsch Exp $
-
-COMMENT=	"high-quality mpeg audio decoder"
-
-VERSION=	0.14.2b
-DISTNAME=	mad-${VERSION}
-CATEGORIES=	audio devel
-
-HOMEPAGE=	http://mad.sourceforge.net/
-
-MAINTAINER=	Peter Valchev <pvalchev@openbsd.org>
-
-PERMIT_PACKAGE_CDROM=   Yes
-PERMIT_PACKAGE_FTP=     Yes
-PERMIT_DISTFILES_CDROM= Yes
-PERMIT_DISTFILES_FTP=   Yes
-
-MASTER_SITES=	ftp://ftp.mars.org/pub/mpeg/ \
-		${MASTER_SITE_SOURCEFORGE:=mad/}
-
-MODULES=	gettext
-
-FLAVORS=	debug esd
-FLAVOR?=
-
-.if ${FLAVOR:L:Mdebug}
-CONFIGURE_ARGS+= --enable-debugging
-.else
-CONFIGURE_ARGS+= --disable-debugging
-.endif
-
-.if ${FLAVOR:L:Mesd}
-CONFIGURE_ARGS+= --with-esd
-LIB_DEPENDS+=	esd.2::audio/esound
-.else
-CONFIGURE_ARGS+= --without-esd
-.endif
-
-SEPARATE_BUILD=	concurrent
-CONFIGURE_STYLE= gnu
-CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
-CONFIGURE_ARGS+= --enable-sso \
-		 --enable-nls
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-Llibmad/.libs -Llibid3tag/.libs -L${LOCALBASE}/lib"
-
-# XXX workaround
-.if ${MACHINE_ARCH} != "powerpc"
-CONFIGURE_ARGS+= --enable-accuracy
-.endif
-
-PATCH_LIST=	${PORTSDIR}/infrastructure/patches/patch-lt1.3.4-ltconfig \
-		${PORTSDIR}/infrastructure/patches/patch-lt1.3.4-ltmain_sh \
-		patch-*
-
-.include <bsd.port.mk>
diff --git a/audio/mad/distinfo b/audio/mad/distinfo
deleted file mode 100644
index 9e4f0191bf4..00000000000
--- a/audio/mad/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (mad-0.14.2b.tar.gz) = eb3bfbe634ba9d5b4928aa11e0f6819d
-RMD160 (mad-0.14.2b.tar.gz) = 5cf96f045de2317cbb5636ee85d153adc19e47da
-SHA1 (mad-0.14.2b.tar.gz) = 07303e2a512a9956d63fef3451ae7823e5f03b68
diff --git a/audio/mad/pkg/DESCR b/audio/mad/pkg/DESCR
deleted file mode 100644
index 4499f40b6ed..00000000000
--- a/audio/mad/pkg/DESCR
+++ /dev/null
@@ -1,23 +0,0 @@
-MAD is a high-quality MPEG audio decoder. It currently supports
-MPEG-1 as well as the MPEG-2 extension to Lower Sampling
-Frequencies. All three audio layers (Layer I, Layer II, and Layer
-III a.k.a. MP3) are fully implemented.
-
-MAD does not yet support MPEG-2 multichannel audio (although it
-should be backward compatible with such streams) or AAC, nor does
-it support the so-called MPEG 2.5 format.
-
-MAD has the following special features:
-
-  - 24-bit PCM output - 100% fixed-point (integer) computation -
-  completely new implementation based on the ISO/IEC standards -
-  distributed under the terms of the GNU General Public License
-  (GPL)
-
-The software is distributed as a library (libmad) and
-command-line front-end (madplay).
-
-Additionally, packages can be built with "debug" flavor to enable
-debugging and "esd" flavor for EsounD support.
-
-WWW: ${HOMEPAGE}
diff --git a/audio/mad/pkg/PFRAG.shared b/audio/mad/pkg/PFRAG.shared
deleted file mode 100644
index 724852d30ad..00000000000
--- a/audio/mad/pkg/PFRAG.shared
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment $OpenBSD: PFRAG.shared,v 1.3 2001/11/20 07:16:31 pvalchev Exp $
-lib/libid3tag.so.1.0
-lib/libmad.so.1.0
-DYNLIBDIR(%B)
diff --git a/audio/mad/pkg/PLIST b/audio/mad/pkg/PLIST
deleted file mode 100644
index 9daa6664a40..00000000000
--- a/audio/mad/pkg/PLIST
+++ /dev/null
@@ -1,17 +0,0 @@
-@comment $OpenBSD: PLIST,v 1.2 2001/10/27 00:11:40 pvalchev Exp $
-bin/abxtest
-bin/madplay
-include/id3tag.h
-include/mad.h
-lib/libid3tag.a
-lib/libid3tag.la
-lib/libmad.a
-lib/libmad.la
-%%SHARED%%
-man/man1/abxtest.1
-man/man1/madplay.1
-share/locale/en/LC_MESSAGES/mad.mo
-share/locale/es/LC_MESSAGES/mad.mo
-share/locale/fr/LC_MESSAGES/mad.mo
-share/locale/hr/LC_MESSAGES/mad.mo
-share/locale/no/LC_MESSAGES/mad.mo