diff --git a/devel/cxref/Makefile b/devel/cxref/Makefile
index 6486e327680d..d0ce10855690 100644
--- a/devel/cxref/Makefile
+++ b/devel/cxref/Makefile
@@ -1,24 +1,35 @@
 PORTNAME=	cxref
 PORTVERSION=	1.6e
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://www.gedanken.org.uk/software/cxref/download/ \
 		http://fossies.org/linux/misc/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	C program cross-referencing and documentation tool
 WWW=		https://www.gedanken.org.uk/software/cxref/
 
 LICENSE=	GPLv2
 
 USES=		gmake shebangfix tar:tgz
 SHEBANG_FILES=	contrib/xrgr.pl
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--without-cxref-cpp
+GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 ALL_TARGET=	programs
 
+OPTIONS_DEFINE=	CPP
+OPTIONS_DEFAULT=
+OPTIONS_SUB=yes
+
+CPP_DESC=	with bundled cpp
+CPP_CONFIGURE_WITH=	cxref-cpp
+
 post-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	@(cd ${WRKSRC}/contrib && ${INSTALL_DATA} *.el *.pl *.py README* \
 		${STAGEDIR}${DATADIR})
 
+post-install-CPP-on:
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/cxref-cpp
+
 .include <bsd.port.mk>
diff --git a/devel/cxref/pkg-plist b/devel/cxref/pkg-plist
index 5d0d2ef3f9f9..71d09b406ddd 100644
--- a/devel/cxref/pkg-plist
+++ b/devel/cxref/pkg-plist
@@ -1,19 +1,24 @@
 bin/cxref
 bin/cxref-cc
+%%CPP%%bin/cxref-cpp
+%%CPP%%bin/cxref-cpp-configure
 bin/cxref-query
-man/man1/cxref-query.1.gz
-man/man1/cxref.1.gz
 %%DATADIR%%/README
 %%DATADIR%%/README.xrgr
 %%DATADIR%%/cflow.el
 %%DATADIR%%/cxref.el
+%%CPP%%%%DATADIR%%/cxref-cpp.defines
 %%DATADIR%%/cxref_includes.pl
 %%DATADIR%%/daVinvi_function.pl
 %%DATADIR%%/daVinvi_include.pl
 %%DATADIR%%/fixheader.pl
 %%DATADIR%%/includes2cxref.pl
 %%DATADIR%%/knr2ansi.pl
 %%DATADIR%%/make_depend.pl
 %%DATADIR%%/tree.pl
 %%DATADIR%%/xrefgraph.py
 %%DATADIR%%/xrgr.pl
+%%CPP%%share/man/man1/cxref-cpp-configure.1.gz
+%%CPP%%share/man/man1/cxref-cpp.1.gz
+share/man/man1/cxref-query.1.gz
+share/man/man1/cxref.1.gz