diff --git a/devel/cscope/Makefile b/devel/cscope/Makefile
index 39f5930179ba..fe2b9078da6f 100644
--- a/devel/cscope/Makefile
+++ b/devel/cscope/Makefile
@@ -6,12 +6,13 @@ PORTVERSION=	15.8a
 CATEGORIES=	devel
 MASTER_SITES=	SF
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	johans@FreeBSD.org
 COMMENT=	Interactive C program browser
 
 LICENSE=	BSD3CLAUSE
 
 OPTIONS_DEFINE=	XCSCOPE
+OPTIONS_SUB=	yes
 XCSCOPE_DESC=	Install (X)Emacs package
 
 GNU_CONFIGURE=	yes
@@ -19,18 +20,11 @@ GNU_CONFIGURE=	yes
 EMACSLISPDIR=	${PREFIX}/share/emacs/site-lisp
 XEMACSLISPDIR=	${PREFIX}/lib/xemacs/site-lisp
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MXCSCOPE}
-PLIST_SUB+=	XCSCOPE=""
 post-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/contrib/xcscope/cscope-indexer ${STAGEDIR}${PREFIX}/bin
 	${MKDIR} ${STAGEDIR}${EMACSLISPDIR}
 	${INSTALL_DATA} ${WRKSRC}/contrib/xcscope/xcscope.el ${STAGEDIR}${EMACSLISPDIR}
 	${MKDIR} ${STAGEDIR}${XEMACSLISPDIR}
 	${LN} -sf ${EMACSLISPDIR}/xcscope.el ${STAGEDIR}${XEMACSLISPDIR}
-.else
-PLIST_SUB+=	XCSCOPE="@comment "
-.endif
 
 .include <bsd.port.mk>