diff --git a/audio/aqualung/Makefile b/audio/aqualung/Makefile
index d0b8b1ae8f0..4167aa82900 100644
--- a/audio/aqualung/Makefile
+++ b/audio/aqualung/Makefile
@@ -4,12 +4,15 @@ VERSION=	2.0
 DISTNAME=	aqualung-${VERSION}
 EPOCH=		0
 CATEGORIES=	audio
-REVISION=	0
+REVISION=	1
 
 HOMEPAGE=	https://github.com/jeremyevans/aqualung
 
 MAINTAINER=	Jeremy Evans <jeremy@openbsd.org>
 
+FLAVORS=	cdda
+FLAVOR?=
+
 # GPLv2
 PERMIT_PACKAGE=	Yes
 
@@ -83,13 +86,21 @@ CONFIGURE_ARGS=	--with-cddb \
 		--with-vorbisenc \
 		--with-wavpack \
 		--without-alsa \
-		--without-cdda \
 		--without-ifp \
 		--without-jack \
 		--without-oss \
 		--without-pulse \
 		--without-winmm
 
+.if ${FLAVOR:Mcdda}
+WANTLIB +=	cdio cdio_cdda cdio_paranoia
+LIB_DEPENDS +=	audio/libcdio \
+		audio/libcdio-paranoia
+CONFIGURE_ARGS += --with-cdda
+.else
+CONFIGURE_ARGS += --without-cdda
+.endif
+
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/applications
 	@${SUBST_CMD} -m 0644 -c ${FILESDIR}/aqualung.desktop \
diff --git a/audio/aqualung/pkg/DESCR b/audio/aqualung/pkg/DESCR
index ecf94bfd950..21d7498df40 100644
--- a/audio/aqualung/pkg/DESCR
+++ b/audio/aqualung/pkg/DESCR
@@ -1,3 +1,6 @@
 Aqualung is an advanced music player. It plays audio CDs, internet radio
 streams and podcasts as well as soundfiles in just about any audio format
 and has the feature of inserting no gaps between adjacent tracks.
+
+Flavor: cdda
+    Include support for Compact Disc Digital Audio (playing and ripping CDs).