diff --git a/.gitignore b/.gitignore
index ddbb444..a9439c6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/mutt-2.0.6.tar.gz
+SOURCES/mutt-2.1.5.tar.gz
diff --git a/.mutt.metadata b/.mutt.metadata
index 9296731..3aba02a 100644
--- a/.mutt.metadata
+++ b/.mutt.metadata
@@ -1 +1 @@
-c4621f76c5493db8055ccfd1b0ed37800962229c SOURCES/mutt-2.0.6.tar.gz
+39910bb724a53518a26bc44a12cc6075eb216e2f SOURCES/mutt-2.1.5.tar.gz
diff --git a/SOURCES/mutt-1.9.4-lynx_no_backscapes.patch b/SOURCES/mutt-1.9.4-lynx_no_backscapes.patch
index d22f63f..6faffd3 100644
--- a/SOURCES/mutt-1.9.4-lynx_no_backscapes.patch
+++ b/SOURCES/mutt-1.9.4-lynx_no_backscapes.patch
@@ -5,7 +5,7 @@ diff -up mutt-1.9.1/doc/Makefile.am.lynx_no_backscapes mutt-1.9.1/doc/Makefile.a
  
  check:
  manual.txt: manual.html
--	-LC_ALL=C lynx -localhost -dump -nolist -with_backspaces -display_charset=us-ascii manual.html > $@ || \
+-	-LC_ALL=C lynx -localhost -dump -nolist -nonumbers -with_backspaces -display_charset=us-ascii manual.html > $@ || \
 +	-LC_ALL=C lynx -localhost -dump -nolist -display_charset=us-ascii manual.html > $@ || \
  	LC_ALL=C w3m -T text/html -I utf-8 -O utf-8 -dump < manual.html > $@ || \
  	LC_ALL=C elinks -dump -no-numbering -no-references manual.html | sed -e 's,\\001, ,g' > $@
diff --git a/SPECS/mutt.spec b/SPECS/mutt.spec
index c466880..064e140 100644
--- a/SPECS/mutt.spec
+++ b/SPECS/mutt.spec
@@ -19,8 +19,8 @@
 
 Summary: A text mode mail user agent
 Name: mutt
-Version: 2.0.6
-Release: 3%{?dist}
+Version: 2.1.5
+Release: 1%{?dist}
 Epoch: 5
 # The entire source code is GPLv2+ except
 # pgpewrap.c setenv.c sha1.c wcwidth.c which are Public Domain
@@ -212,6 +212,10 @@ ln -sf ./muttrc.5 %{buildroot}%{_mandir}/man5/muttrc.local.5
 
 
 %changelog
+* Tue Jan 11 2022 Matej Mužila <mmuzila@redhat.com> - 5:2.1.5-1
+- Rebase to upstream version 2.1.5
+  Resolves: rhbz#2032988 rhbz#1959896
+
 * Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 5:2.0.6-3
 - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
   Related: rhbz#1991688