diff --git a/grep-2.28-help-align.patch b/grep-3.31-help-align.patch
similarity index 75%
rename from grep-2.28-help-align.patch
rename to grep-3.31-help-align.patch
index adf4a9d..caf6d4c 100644
--- a/grep-2.28-help-align.patch
+++ b/grep-3.31-help-align.patch
@@ -1,8 +1,8 @@
 diff --git a/src/grep.c b/src/grep.c
-index 8c2054b..ba67e8b 100644
+index a2de03d..fd1b3a9 100644
 --- a/src/grep.c
 +++ b/src/grep.c
-@@ -1979,17 +1979,20 @@ Output control:\n\
+@@ -1962,17 +1962,20 @@ Output control:\n\
    -D, --devices=ACTION      how to handle devices, FIFOs and sockets;\n\
                              ACTION is 'read' or 'skip'\n\
    -r, --recursive           like --directories=recurse\n\
@@ -23,8 +23,8 @@ index 8c2054b..ba67e8b 100644
 +      --exclude-dir=PATTERN directories that match PATTERN will be skipped.\n\
  "));
        printf (_("\
--  -L, --files-without-match  print only names of FILEs containing no match\n\
-+  -L, --files-without-match print only names of FILEs containing no match\n\
-   -l, --files-with-matches  print only names of FILEs containing matches\n\
-   -c, --count               print only a count of matching lines per FILE\n\
+-  -L, --files-without-match  print only names of FILEs with no selected lines\n\
++  -L, --files-without-match print only names of FILEs with no selected lines\n\
+   -l, --files-with-matches  print only names of FILEs with selected lines\n\
+   -c, --count               print only a count of selected lines per FILE\n\
    -T, --initial-tab         make tabs line up (if needed)\n\
diff --git a/grep-2.28-man-fix-gs.patch b/grep-3.31-man-fix-gs.patch
similarity index 89%
rename from grep-2.28-man-fix-gs.patch
rename to grep-3.31-man-fix-gs.patch
index 461f05b..233270f 100644
--- a/grep-2.28-man-fix-gs.patch
+++ b/grep-3.31-man-fix-gs.patch
@@ -1,8 +1,8 @@
 diff --git a/doc/grep.in.1 b/doc/grep.in.1
-index e3472f7..28709f7 100644
+index 40c9586..a4e89eb 100644
 --- a/doc/grep.in.1
 +++ b/doc/grep.in.1
-@@ -327,7 +327,7 @@ Print
+@@ -335,7 +335,7 @@ Print
  .I NUM
  lines of trailing context after matching lines.
  Places a line containing a group separator
@@ -11,7 +11,7 @@ index e3472f7..28709f7 100644
  between contiguous groups of matches.
  With the
  .B \-o
-@@ -340,7 +340,7 @@ Print
+@@ -348,7 +348,7 @@ Print
  .I NUM
  lines of leading context before matching lines.
  Places a line containing a group separator
@@ -20,7 +20,7 @@ index e3472f7..28709f7 100644
  between contiguous groups of matches.
  With the
  .B \-o
-@@ -353,13 +353,24 @@ Print
+@@ -361,13 +361,24 @@ Print
  .I NUM
  lines of output context.
  Places a line containing a group separator
@@ -47,10 +47,10 @@ index e3472f7..28709f7 100644
  .TP
  .BR \-a ", " \-\^\-text
 diff --git a/src/grep.c b/src/grep.c
-index 81654c3..8c2054b 100644
+index 8d22aec..a2de03d 100644
 --- a/src/grep.c
 +++ b/src/grep.c
-@@ -2003,6 +2003,8 @@ Context control:\n\
+@@ -1986,6 +1986,8 @@ Context control:\n\
  "));
        printf (_("\
    -NUM                      same as --context=NUM\n\
diff --git a/grep.spec b/grep.spec
index 230a239..92caed4 100644
--- a/grep.spec
+++ b/grep.spec
@@ -2,7 +2,7 @@
 
 Summary: Pattern matching utilities
 Name: grep
-Version: 3.0
+Version: 3.1
 Release: 1%{?dist}
 License: GPLv3+
 URL: http://www.gnu.org/software/grep/
@@ -14,9 +14,9 @@ Source2: colorgrep.csh
 Source3: GREP_COLORS
 Source4: grepconf.sh
 # upstream ticket 39444
-Patch0: grep-2.28-man-fix-gs.patch
+Patch0: grep-3.31-man-fix-gs.patch
 # upstream ticket 39445
-Patch1: grep-2.28-help-align.patch
+Patch1: grep-3.31-help-align.patch
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
 
@@ -86,6 +86,11 @@ fi
 %{_libexecdir}/grepconf.sh
 
 %changelog
+* Mon Jul  3 2017 Jaroslav Škarvada <jskarvad@redhat.com> - 3.1-1
+- New version
+  Related: rhbz#1421129
+- Updated patches
+
 * Fri Feb 10 2017 Jaroslav Škarvada <jskarvad@redhat.com> - 3.0-1
 - New version
   Resolves: rhbz#1421129
diff --git a/sources b/sources
index 85a07b0..d9baf39 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (grep-3.0.tar.xz) = 0e9a00df9d492f399230bae0264942edaf64bb926f93edb7922f27b075a86ba0a78698f54996cc522b6261aa01a8ecbeadeb68523d4470a9941f242c3ae24c58
+SHA512 (grep-3.1.tar.xz) = 05494381c7dd8aad7e2ee4c17450de8d7b969a99dcfe17747db60df3475bf02d5323d091e896e8343e4f3251c29dc7f0b7a9f93c575c9d58ee2a57014c2c9d26