diff --git a/.gitignore b/.gitignore
index 039eab8..7d7096c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ RPMS
 SRPMS
 
 SOURCES/grep-3.6.tar.xz
+SOURCES/grep-3.7.tar.xz
diff --git a/.grep.metadata b/.grep.metadata
index 94971b1..135a035 100644
--- a/.grep.metadata
+++ b/.grep.metadata
@@ -1 +1 @@
-f7e03879b0348e7a00c28f2f50194792a8aace23 SOURCES/grep-3.6.tar.xz
+4d56da85e468e4012c81533a22052014a4c98b17 SOURCES/grep-3.7.tar.xz
diff --git a/SOURCES/grep-3.5-man-fix-gs.patch b/SOURCES/grep-3.5-man-fix-gs.patch
deleted file mode 100644
index 425aae9..0000000
--- a/SOURCES/grep-3.5-man-fix-gs.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-diff --git a/doc/grep.in.1 b/doc/grep.in.1
-index 91c0bca..d2cf00a 100644
---- a/doc/grep.in.1
-+++ b/doc/grep.in.1
-@@ -464,7 +464,7 @@ Print
- .I NUM
- lines of trailing context after matching lines.
- Places a line containing a group separator
--.RB ( \-\^\- )
-+.RB "(described under " \-\^\-group\-separator )
- between contiguous groups of matches.
- With the
- .B \-o
-@@ -477,7 +477,7 @@ Print
- .I NUM
- lines of leading context before matching lines.
- Places a line containing a group separator
--.RB ( \-\^\- )
-+.RB "(described under " \-\^\-group\-separator )
- between contiguous groups of matches.
- With the
- .B \-o
-@@ -490,13 +490,24 @@ Print
- .I NUM
- lines of output context.
- Places a line containing a group separator
--.RB ( \-\^\- )
-+.RB "(described under " \-\^\-group\-separator )
- between contiguous groups of matches.
- With the
- .B \-o
- or
- .B \-\^\-only\-matching
- option, this has no effect and a warning is given.
-+.TP
-+.BI \-\^\-group\-separator= SEP
-+Use
-+.I SEP
-+as a group separator. By default
-+.I SEP
-+is double hyphen
-+.RB ( \-\^\- ).
-+.TP
-+.B \-\^\-no\-group-separator
-+Use empty string as a group separator.
- .SS "File and Directory Selection"
- .TP
- .BR \-a ", " \-\^\-text
-diff --git a/src/grep.c b/src/grep.c
-index de7616a..a530988 100644
---- a/src/grep.c
-+++ b/src/grep.c
-@@ -2047,6 +2047,8 @@ Context control:\n\
- "));
-       printf (_("\
-   -NUM                      same as --context=NUM\n\
-+      --group-separator=SEP use SEP as a group separator\n\
-+      --no-group-separator  use empty string as a group separator\n\
-       --color[=WHEN],\n\
-       --colour[=WHEN]       use markers to highlight the matching strings;\n\
-                             WHEN is 'always', 'never', or 'auto'\n\
diff --git a/SOURCES/sources b/SOURCES/sources
deleted file mode 100644
index c1c727a..0000000
--- a/SOURCES/sources
+++ /dev/null
@@ -1 +0,0 @@
-SHA512 (grep-3.6.tar.xz) = 8934544a19ded61344d83ff2cab501e86f17f8ae338892e0c36c2d2d8e63c76817840a0071ef5e3fcbca9115eba8a1aae0e4c46b024e75cd9a2e3bd05f933d90
diff --git a/SPECS/grep.spec b/SPECS/grep.spec
index 35142ae..2211c00 100644
--- a/SPECS/grep.spec
+++ b/SPECS/grep.spec
@@ -1,7 +1,7 @@
 Summary: Pattern matching utilities
 Name: grep
-Version: 3.6
-Release: 3%{?dist}
+Version: 3.7
+Release: 1.1%{?dist}
 License: GPLv3+
 URL: https://www.gnu.org/software/grep/
 
@@ -10,18 +10,21 @@ Source1: colorgrep.sh
 Source2: colorgrep.csh
 Source3: GREP_COLORS
 Source4: grepconf.sh
-# upstream ticket 39444
-Patch0: grep-3.5-man-fix-gs.patch
 # upstream ticket 39445
-Patch1: grep-3.5-help-align.patch
+Patch0: grep-3.5-help-align.patch
 
 BuildRequires: gcc
-BuildRequires: pcre-devel >= 3.9-10, texinfo, gettext
-BuildRequires: autoconf automake glibc-all-langpacks
+BuildRequires: pcre-devel >= 3.9-10
+BuildRequires: texinfo
+BuildRequires: gettext
+BuildRequires: autoconf
+BuildRequires: automake
+Buildrequires: glibc-all-langpacks
 %if 0%{?fedora} >= 33 || 0%{?rhel} >= 9
 BuildRequires: perl-FileHandle
 %endif
 BuildRequires: make
+BuildRequires: libsigsegv-devel
 # https://fedorahosted.org/fpc/ticket/174
 Provides: bundled(gnulib)
 # for backward compatibility (rhbz#1540485)
@@ -37,9 +40,7 @@ prints the matching lines. GNU's grep utilities include grep, egrep and fgrep.
 GNU grep is needed by many scripts, so it shall be installed on every system.
 
 %prep
-%setup -q
-%patch0 -p1 -b .man-fix-gs
-%patch1 -p1 -b .help-align
+%autosetup -p1
 
 %build
 %global BUILD_FLAGS $RPM_OPT_FLAGS
@@ -51,7 +52,10 @@ GNU grep is needed by many scripts, so it shall be installed on every system.
 %global BUILD_FLAGS %{BUILD_FLAGS} -mlong-double-64
 %endif
 
-%configure --without-included-regex --disable-silent-rules \
+# Temporarily switch to the included regex until glibc bug is fixed:
+# https://sourceware.org/bugzilla/show_bug.cgi?id=11053
+#%%configure --without-included-regex --disable-silent-rules \
+%configure --disable-silent-rules \
   CPPFLAGS="-I%{_includedir}/pcre" CFLAGS="%{BUILD_FLAGS}"
 %make_build
 
@@ -81,6 +85,21 @@ make check
 %{_libexecdir}/grepconf.sh
 
 %changelog
+* Thu Sep 23 2021 Davide Cavalca <dcavalca@centosproject.org> - 3.7-1.1
+- Update to 3.7 and rebuild for Hyperscale
+
+* Mon Aug 16 2021 Jaroslav Škarvada <jskarvad@redhat.com> - 3.7-1
+- New version
+  Resolves: rhbz#1993631
+- Temporarily switch to the included regex until glibc bug (glibc#11053)
+  is fixed
+
+* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.6-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Wed Jun 23 2021 Jaroslav Škarvada <jskarvad@redhat.com> - 3.6-3
+- Fixed stack overflow detection
+
 * Wed Feb 17 2021 Davide Cavalca <dcavalca@fedoraproject.org> - 3.6-3
 - Gate perl-FileHandle dependency to f33 onwards