diff --git a/misc/cdrdao/Makefile b/misc/cdrdao/Makefile
index 5d3809b7b2f..bf6edaf0e41 100644
--- a/misc/cdrdao/Makefile
+++ b/misc/cdrdao/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.21 2005/05/31 19:40:24 millert Exp $
+# $OpenBSD: Makefile,v 1.22 2005/06/04 23:11:51 fgsch Exp $
 
 COMMENT=	"write audio/data CD-Rs in disk-at-once mode"
 
@@ -19,10 +19,27 @@ WANTLIB=		c m stdc++
 USE_GMAKE=		Yes
 CONFIGURE_STYLE=	gnu
 MODGNU_CONFIG_GUESS_DIRS=${WRKSRC} ${WRKSRC}/paranoia ${WRKSRC}/scsilib/conf
-CONFIGURE_ARGS+=	--with-posix-threads=no --without-lame \
-			--with-gtkmm-prefix=/nonexistent
+CONFIGURE_ARGS+=	--with-posix-threads=no \
+			--with-xdao=no
 MAKE_ENV=		CCOM="${CC}"
 
+FLAVORS=	audio
+FLAVOR?=
+
+.if ${FLAVOR:L:Maudio}
+CONFIGURE_ARGS+=	--with-lame-lib=${LOCALBASE}/lib \
+			--with-lame-include=${LOCALBASE}/include
+BUILD_DEPENDS+=		:libmad->=0.15.1bp0:audio/libmad
+LIB_DEPENDS+=		mp3lame::audio/lame \
+			ao.3::audio/libao \
+			mad.2::audio/libmad
+WANTLIB+=		ao.3 ogg.5 vorbis.4 vorbisfile.4
+.else
+CONFIGURE_ARGS+=	--with-ogg-support=no \
+			--with-mp3-support=no \
+			--without-lame
+.endif
+
 .if ${MACHINE} != "i386" || ${CC} != "cc"
 pre-configure:
 	@ln -sf ${WRKSRC}/scsilib/RULES/i386-openbsd-cc.rul \
diff --git a/misc/cdrdao/pkg/DESCR b/misc/cdrdao/pkg/DESCR
index fcce3e2f84f..695b0b7100d 100644
--- a/misc/cdrdao/pkg/DESCR
+++ b/misc/cdrdao/pkg/DESCR
@@ -1,36 +1,9 @@
-What does it?
+Writes audio CD-Rs in disc-at-once (DAO) mode allowing control over
+pre-gaps (length down to 0, nonzero audio data) and sub-channel
+information like ISRC codes. All data that is written to the disc
+must be specified with a text file. Audio data may be in WAVE or
+raw format.
 
- Cdrdao records audio or data CD-Rs in disk-at-once (DAO) mode based
- on a textual description of the CD contents (toc-file).
- 
-Why DAO?
+Flavors:
+	audio - build with MP3/Ogg decoding support.
 
- Recording in disk-at-once mode writes the complete disc,
- i.e. lead-in, one or more tracks and lead-out, in a single step.
- The commonly used track-at-once (TAO) mode writes each track
- independently which requires link blocks between two tracks. Older
- CD-recorder models forced a two second pause (pre-gap) between two
- tracks whereas newer models allow adjusting of the pause length in
- TAO mode reducing the number of link blocks to a minimal amount.
- However, with TAO it is generally not possible to define the data
- that is written in pre-gaps. But exactly this feature makes audio
- CD recording interesting, e.g. by creating hidden bonus tracks or
- track intros in pre-gaps like it is common habit on commercial CDs.
- Finally, DAO recording is the only way to write data to the unused
- R-W sub-channels for e.g.  CD-G or CD-TEXT.
- 
-Features
-
- * Full control over length and contents of pre-gaps (pause areas
-   between tracks). Pre-gaps may be completely omitted, e.g. for
-   dividing live recordings into tracks.
- * Control over sub-channel data like:
-      + catalog number
-      + copy, pre-emphasis, 2-/4-channel flags
-      + ISRC code
-      + index marks
- * Support for exact audio or data CD copying.
- * Tracks may be composed of different audio files supporting non
-   destructive cut.
- * Accepts WAVE and raw audio files.
- * CD-TEXT reading and writing with drives that support it.
diff --git a/misc/cdrdao/pkg/PLIST b/misc/cdrdao/pkg/PLIST
index 62341b27514..6763b5b7cd9 100644
--- a/misc/cdrdao/pkg/PLIST
+++ b/misc/cdrdao/pkg/PLIST
@@ -1,8 +1,9 @@
-@comment $OpenBSD: PLIST,v 1.6 2005/05/31 19:40:24 millert Exp $
+@comment $OpenBSD: PLIST,v 1.7 2005/06/04 23:11:51 fgsch Exp $
 bin/cdrdao
 bin/cue2toc
 bin/toc2cddb
 bin/toc2cue
+%%audio%%
 @man man/man1/cdrdao.1
 @man man/man1/cue2toc.1
 share/cdrdao/