diff --git a/sysutils/cpu-x/Makefile b/sysutils/cpu-x/Makefile
index 70041938b6cd..b3ebda4e8be3 100644
--- a/sysutils/cpu-x/Makefile
+++ b/sysutils/cpu-x/Makefile
@@ -1,42 +1,51 @@
 PORTNAME=	cpu-x
 PORTVERSION=	4.5.3
 DISTVERSIONPREFIX=	v
 CATEGORIES=	sysutils
+PKGNAMESUFFIX=	-${FLAVOR}
 
 MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	Gathers information about CPU, motherboard, and more
 WWW=		https://thetumultuousunicornofdarkness.github.io/CPU-X/
 
 LICENSE=	GPLv3+
 
 BUILD_DEPENDS=	nasm:devel/nasm
 LIB_DEPENDS=	libcpuid.so:sysutils/libcpuid \
 		libpci.so:devel/libpci \
 		libstatgrab.so:devel/libstatgrab
 
-USES=		cmake ncurses pkgconfig
+USES=		cmake pkgconfig
 USE_GITHUB=	yes
 GH_ACCOUNT=	TheTumultuousUnicornOfDarkness
 GH_PROJECT=	${PORTNAME:tu}
 CMAKE_OFF=	WITH_LIBGLFW WITH_VULKAN WITH_OPENCL
 
 PORTDOCS=	ChangeLog.md README.md
 
-OPTIONS_DEFINE=	DOCS NLS X11
-OPTIONS_DEFAULT=	X11
+OPTIONS_DEFINE=	DOCS NLS
 OPTIONS_SUB=	yes
 
 NLS_USES=	gettext
 NLS_CMAKE_OFF=	-DWITH_GETTEXT:BOOL=OFF
 
-X11_DESC=	Build GTK+3 frontend in addition to ncurses one
-X11_USES=	gnome
-X11_USE=	GNOME=gtk30
-X11_CMAKE_OFF=	-DWITH_GTK:BOOL=OFF
-X11_VARS=	GLIB_SCHEMAS=org.cpu-x.gschema.xml
+FLAVORS=	gtk3 ncurses
+
+CONFLICTS_INSTALL=	${FLAVORS:N${FLAVOR}:S/^/${PORTNAME}-/}
+
+.if ${FLAVOR:U} == ncurses
+USES+=		ncurses
+CMAKE_ARGS+=	-DWITH_GTK:BOOL=OFF
+PLIST_SUB+=	X11="@comment "
+.else
+USES+=		gnome
+USE_GNOME=	gtk30
+GLIB_SCHEMAS=	org.cpu-x.gschema.xml
+PLIST_SUB+=	X11=""
+.endif
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>