diff --git a/textproc/gnugrep/Makefile b/textproc/gnugrep/Makefile
index 1ad7dd901b9e..5077afc5f7a8 100644
--- a/textproc/gnugrep/Makefile
+++ b/textproc/gnugrep/Makefile
@@ -1,51 +1,51 @@
 # Created by: Gabor Kovesdan <gabor@FreeBSD.org>
 
 PORTNAME=	grep
-PORTVERSION=	3.6
+PORTVERSION=	3.7
 CATEGORIES=	textproc
 MASTER_SITES=	GNU
 PKGNAMEPREFIX=	gnu
 
 MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	GNU version of popular pattern matching utility
 
 LICENSE=	GPLv3+
 
 CONFLICTS=	bsd-grep-[0-9]*
 
 USES=		charsetfix cpe tar:xz
 GNU_CONFIGURE=	yes
 TEST_TARGET=	check
 
 INFO=		grep
 CPE_VENDOR=	gnu
 
 OPTIONS_DEFINE=		ICONV LIBSIGSEGV NLS PCRE
 OPTIONS_DEFAULT=	ICONV PCRE
 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=	libpcre.so:devel/pcre
 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
 
 post-patch-NLS-off:
 	@${REINPLACE_CMD} '/install-exec-local:/s/install-exec-localcharset//' \
 		${WRKSRC}/lib/Makefile.in
 
 .include <bsd.port.mk>
diff --git a/textproc/gnugrep/distinfo b/textproc/gnugrep/distinfo
index 42c268340904..7933d95b9929 100644
--- a/textproc/gnugrep/distinfo
+++ b/textproc/gnugrep/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1604896813
-SHA256 (grep-3.6.tar.xz) = 667e15e8afe189e93f9f21a7cd3a7b3f776202f417330b248c2ad4f997d9373e
-SIZE (grep-3.6.tar.xz) = 1589412
+TIMESTAMP = 1628970999
+SHA256 (grep-3.7.tar.xz) = 5c10da312460aec721984d5d83246d24520ec438dd48d7ab5a05dbc0d6d6823c
+SIZE (grep-3.7.tar.xz) = 1641196
diff --git a/textproc/gnugrep/files/patch-configure b/textproc/gnugrep/files/patch-configure
new file mode 100644
index 000000000000..03c89bad1907
--- /dev/null
+++ b/textproc/gnugrep/files/patch-configure
@@ -0,0 +1,20 @@
+--- configure.orig	2021-08-14 19:53:52 UTC
++++ configure
+@@ -35665,7 +35665,7 @@ else $as_nop
+       elxsi | \
+       fr30 | \
+       h8300 | \
+-      i?86 | x86_64 | \
++      i?86 | x86_64 | amd64 | \
+       i860 | \
+       ia64 | \
+       m32r | \
+@@ -35714,7 +35714,7 @@ find_stack_direction (int *addr, int depth)
+   return dir + dummy;
+ }
+ int
+-main (int argc, char *argv)
++main (int argc, char *argv[])
+ {
+   printf ("%d\n", find_stack_direction (NULL, argc + 20));
+   return 0;