diff --git a/audio/grip/Makefile b/audio/grip/Makefile
index c911120011f..f32e05ecc5c 100644
--- a/audio/grip/Makefile
+++ b/audio/grip/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.11 2004/09/26 09:23:44 sturm Exp $
+# $OpenBSD: Makefile,v 1.12 2004/11/21 14:16:30 espie Exp $
 
 COMMENT=	"front-end to external cd audio rippers and mp3 encoders"
 
@@ -15,6 +15,12 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
+WANTLIB=		ICE SM X11 Xext Xi audiofile c \
+			esd gdk_imlib glib gmodule jpeg \
+			m png pthread stdc++ tiff ungif z
+
+FLAVORS=	cdparanoia
+FLAVOR?=
 
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=grip/}
 
@@ -32,4 +38,10 @@ CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
 			LDFLAGS="-L${LOCALBASE}/lib" \
 			LIBS="-pthread"
 
+.if ${FLAVOR:L:Mcdparanoia}
+LIB_DEPENDS+=	cdda_interface,cdda_paranoia::audio/cdparanoia
+.else
+CONFIGURE_ARGS+=	--disable-cdpar
+.endif
+
 .include <bsd.port.mk>