diff --git a/net/mtr/Makefile b/net/mtr/Makefile
index 54f15e84b2a..8c9aecf484d 100644
--- a/net/mtr/Makefile
+++ b/net/mtr/Makefile
@@ -17,22 +17,29 @@ USES=		autoreconf ncurses pkgconfig
 GNU_CONFIGURE=	yes
 LDFLAGS+=	-lncurses
 
+FLAVORS=	x11 nox11
+FLAVOR?=	${FLAVORS:[1]}
+nox11_PKGNAMESUFFIX=	-nox11
+.if ${FLAVOR} == x11
+CONFIGURE_ARGS+=--with-gtk
+USE_GNOME=	gtk20
+USES+=		gnome
+.else
+CONFIGURE_ARGS+=--without-gtk
+.endif
+
 USE_GITHUB=	yes
 GH_ACCOUNT=	traviscross
 
 CONFLICTS_INSTALL=	mtr mtr-nox11
 
-OPTIONS_DEFINE=	IPV6 JSON X11
-OPTIONS_DEFAULT=JSON X11
+OPTIONS_DEFINE=	IPV6 JSON
+OPTIONS_DEFAULT=JSON
 JSON_DESC=	JSON support
-X11_DESC=	Build X11-enabled mtr
 
 IPV6_CONFIGURE_ENABLE=	ipv6
 JSON_CONFIGURE_WITH=	jansson
 JSON_LIB_DEPENDS=	libjansson.so:devel/jansson
-X11_CONFIGURE_WITH=	gtk
-X11_USE=		GNOME=gtk20
-X11_USES=		gnome
 
 post-install:
 	@${ECHO_MSG} ""