diff --git a/textproc/gnugrep/Makefile b/textproc/gnugrep/Makefile
index 12e11853bf45..82fa50d26440 100644
--- a/textproc/gnugrep/Makefile
+++ b/textproc/gnugrep/Makefile
@@ -1,61 +1,58 @@
 PORTNAME=	grep
-PORTVERSION=	3.11
+PORTVERSION=	3.12
 CATEGORIES=	textproc
 MASTER_SITES=	GNU
 PKGNAMEPREFIX=	gnu
 
 MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	GNU version of popular pattern matching utility
 WWW=		https://www.gnu.org/software/grep/
 
 LICENSE=	GPLv3+
 
-CONFLICTS=	bsd-grep
-
 USES=		charsetfix cpe tar:xz
 GNU_CONFIGURE=	yes
-GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 CONFIGURE_ARGS=	--program-prefix=g
 TEST_TARGET=	check
 
 INFO=		grep
 CPE_VENDOR=	gnu
 
 OPTIONS_DEFINE=		COMPAT ICONV LIBSIGSEGV NLS PCRE
-OPTIONS_DEFAULT=	COMPAT ICONV PCRE
+OPTIONS_DEFAULT=	ICONV PCRE
 COMPAT_DESC=		Create g-prefixless compatibility symlinks
 LIBSIGSEGV_DESC=	Use alternative page fault handler (GNU libsigsegv)
 OPTIONS_SUB=		yes
 
 ICONV_CONFIGURE_USES=	iconv
 ICONV_CONFIGURE_WITH=	libiconv-prefix=${LOCALBASE}
 
 LIBSIGSEGV_LIB_DEPENDS=	libsigsegv.so:devel/libsigsegv
 LIBSIGSEGV_CONFIGURE_WITH=	libsigsegv-prefix=${LOCALBASE}
 
 NLS_USES=		gettext
 NLS_CONFIGURE_ENABLE=	nls
 NLS_CONFIGURE_WITH=	libintl-prefix=${LOCALBASE}
 
 PCRE_LIB_DEPENDS=	libpcre2-8.so:devel/pcre2
 PCRE_USES=		pkgconfig
 PCRE_CONFIGURE_ENABLE=	perl-regexp
 
 post-patch:
 	@${REINPLACE_CMD} 's:@grep@:${PREFIX}/bin/&:' ${WRKSRC}/src/egrep.sh
 	@${REINPLACE_CMD} 's|mkinstalldirs = .*|mkinstalldirs = ${MKDIR}|g' \
 		${WRKSRC}/po/Makefile.in.in
-# Remove useless(?) macro to avoid run-time dependency on `textproc/groff'
-	@${REINPLACE_CMD} '/Map mono-width fonts to standard fonts/,+6d' \
+# Don't use extension register to avoid run-time dependency on `textproc/groff'
+	@${REINPLACE_CMD} 's,do nr mH .* groff extension register,nr mH 0,' \
 		${WRKSRC}/doc/grep.in.1
 
 post-patch-NLS-off:
 	@${REINPLACE_CMD} '/install-exec-local:/s/install-exec-localcharset//' \
 		${WRKSRC}/lib/Makefile.in
 
 post-install-COMPAT-on:
 .for p in grep egrep fgrep
 	${LN} -sf g${p} ${STAGEDIR}${PREFIX}/bin/${p}
 .endfor
 
 .include <bsd.port.mk>
diff --git a/textproc/gnugrep/distinfo b/textproc/gnugrep/distinfo
index fe758ac20332..ae1b2096918c 100644
--- a/textproc/gnugrep/distinfo
+++ b/textproc/gnugrep/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1683967158
-SHA256 (grep-3.11.tar.xz) = 1db2aedde89d0dea42b16d9528f894c8d15dae4e190b59aecc78f5a951276eab
-SIZE (grep-3.11.tar.xz) = 1703776
+TIMESTAMP = 1744301167
+SHA256 (grep-3.12.tar.xz) = 2649b27c0e90e632eadcd757be06c6e9a4f48d941de51e7c0f83ff76408a07b9
+SIZE (grep-3.12.tar.xz) = 1918448