diff --git a/textproc/groff/Makefile b/textproc/groff/Makefile
index 64fa4cd2f244..3b41a61fed3c 100644
--- a/textproc/groff/Makefile
+++ b/textproc/groff/Makefile
@@ -1,67 +1,69 @@
 PORTNAME=	groff
 DISTVERSION=	1.24.1
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	GNU
 
 MAINTAINER=	alven@FreeBSD.org
 COMMENT=	Software typesetting package
 WWW=		https://www.gnu.org/software/groff/
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	gsfonts>=0:print/gsfonts \
 		psselect:print/psutils
 RUN_DEPENDS=	psselect:print/psutils
 
 USES=		cpe gmake iconv:wchar_t perl5
 CPE_VENDOR=	gnu
 USE_CXXSTD=	gnu++98
 
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-urw-fonts-dir=${LOCALBASE}/share/ghostscript/fonts/ \
 			--without-gs \
 			--without-x
 
 # Canonicalize to A4 if set.
 .if defined(A4) || (defined(PAPERSIZE) && ${PAPERSIZE:tu} == "A4")
 PAPERSIZE=	A4
 .endif
 .if defined(PAPERSIZE)
 CONFIGURE_ENV+=	PAGE=${PAPERSIZE}
 .endif
 
 MAKE_ARGS=	datasubdir=${DATADIR} \
 		docdir=${DOCSDIR} \
 		exampledir=${EXAMPLESDIR}
 
 CONFLICTS=	heirloom-doctools ja-groff
+CONFLICTS_INSTALL=	mandoc
 
 INFO=		groff
 PORTDOCS=	*
 PORTEXAMPLES=	*
 
 OPTIONS_DEFINE=		DOCS EXAMPLES UCHARDET
 OPTIONS_DEFAULT=	UCHARDET
 
 UCHARDET_DESC=		Automatic encoding detection in preconv(1)
 
 UCHARDET_LIB_DEPENDS=	libuchardet.so:textproc/uchardet
 UCHARDET_USES=		pkgconfig
 UCHARDET_CONFIGURE_OFF=	--with-uchardet=no
 
 post-install:
 	${INSTALL_DATA} ${FILESDIR}/mdoc.local ${STAGEDIR}${PREFIX}/share/groff/site-tmac
 	${REINPLACE_CMD} -i "" -e "s/missing/gs/" ${STAGEDIR}${DATADIR}/font/devhtml/DESC
 	${RLN} . ${STAGEDIR}${DATADIR}/current
 
 post-install-DOCS-on:
 	${LN} -f ${STAGEDIR}${EXAMPLESDIR}/mom/mom-pdf.pdf ${STAGEDIR}${DOCSDIR}/pdf
 
 post-install-DOCS-off:
 	${RM} -r ${STAGEDIR}${DOCSDIR}
 
 post-install-EXAMPLES-off:
 	${RM} -r ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
diff --git a/textproc/mandoc/Makefile b/textproc/mandoc/Makefile
index 54773537bef6..107e51ae8348 100644
--- a/textproc/mandoc/Makefile
+++ b/textproc/mandoc/Makefile
@@ -1,37 +1,39 @@
 PORTNAME=	mandoc
 PORTVERSION=	1.14.6
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	textproc
 MASTER_SITES=	http://mandoc.bsd.lv/snapshots/ \
 		LOCAL/uqs
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Suite of for tools compiling mdoc and man macros
 WWW=		https://mandoc.bsd.lv/
 
 LICENSE=	ISCL
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libsqlite3.so:databases/sqlite3
 
 EXAMPLESDIR=	${PREFIX}/share/examples/mandoc
 
 HAS_CONFIGURE=	yes
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
+CONFLICTS_INSTALL=	groff
+
 post-configure:
 	@${REINPLACE_CMD} -e '/^CFLAGS/s/=/?=/' -e '/^PREFIX/s/=/?=/' \
 		-e 's/^INSTALL_PROGRAM.*/INSTALL_PROGRAM=${INSTALL_PROGRAM}/' \
 		-e 's|/var/www|${WWWDIR}|' \
 		-e 's|^MANDIR.*|MANDIR=${PREFIX}/share/man|' \
 		${WRKSRC}/Makefile.local
 	${CP} ${WRKSRC}/cgi.h.example ${WRKSRC}/cgi.h
 
 post-build:
 	cd ${WRKSRC} && ${MAKE} ${MAKE_ARGS} man.cgi
 
 post-install:
 	cd ${WRKSRC} && ${MAKE} ${MAKE_ARGS} cgi-install
 
 .include <bsd.port.mk>