Index: multimedia/libva-intel-driver/Makefile
===================================================================
--- multimedia/libva-intel-driver/Makefile
+++ multimedia/libva-intel-driver/Makefile
@@ -12,6 +12,10 @@
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
+FLAVORS=	default hybrid
+default_CONFLICTS_INSTALL=	${PORTNAME}@hybrid
+hybrid_CONFLICTS_INSTALL=	${PORTNAME}
+
 LIB_DEPENDS=	libva.so:multimedia/libva \
 		libdrm.so:graphics/libdrm
 BUILD_DEPENDS=	${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat
@@ -30,11 +34,12 @@
 ONLY_FOR_ARCHS=	amd64 i386
 ONLY_FOR_ARCHS_REASON=	Driver for hardware present only on intel i386 and amd64 CPUs
 
-OPTIONS_DEFINE=	HYBRID
-
-HYBRID_DESC=	Hybrid codec support (e.g., VP9 decoding on Skylake)
-HYBRID_RUN_DEPENDS=	${LOCALBASE}/lib/dri/hybrid_drv_video.so:multimedia/libva-intel-hybrid-driver
-HYBRID_CONFIGURE_ENABLE=	hybrid-codec
+.if ${FLAVOR:U} == hybrid
+PKGNAMESUFFIX=	@${FLAVOR}
+COMMENT:=	${COMMENT} with Hybrid codec support
+RUN_DEPENDS+=	${LOCALBASE}/lib/dri/hybrid_drv_video.so:multimedia/libva-intel-hybrid-driver
+CONFIGURE_ARGS+=--enable-hybrid-codec
+.endif
 
 post-patch:	.SILENT
 	${REINPLACE_CMD} -e 's/-ldl//' \
Index: multimedia/libva-intel-driver/pkg-descr
===================================================================
--- multimedia/libva-intel-driver/pkg-descr
+++ multimedia/libva-intel-driver/pkg-descr
@@ -1,4 +1,8 @@
 Libva driver for intel graphics cards with hardware accelerated
 features for video encode/decode.
 
+@hybrid flavor adds support for partial VP8 encoding on IvyBridge,
+BayTrail, Haswell and partial VP9 decoding on Haswell, Broadwell,
+Cherryview, Skylake.
+
 WWW: https://github.com/intel/intel-vaapi-driver