diff --git a/.gitignore b/.gitignore
index 614ff9e..b97333d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -40,3 +40,5 @@ mutt-1.5.23.tar.gz
 /mutt-1.14.7.tar.gz
 /mutt-2.0.2.tar.gz
 /mutt-2.0.5.tar.gz
+/mutt-2.0.6.tar.gz
+/mutt-2.0.7.tar.gz
diff --git a/mutt.spec b/mutt.spec
index b7a23cd..37d48f2 100644
--- a/mutt.spec
+++ b/mutt.spec
@@ -19,8 +19,8 @@
 
 Summary: A text mode mail user agent
 Name: mutt
-Version: 2.0.5
-Release: 1%{?dist}
+Version: 2.0.7
+Release: 2%{?dist}
 Epoch: 5
 # The entire source code is GPLv2+ except
 # pgpewrap.c setenv.c sha1.c wcwidth.c which are Public Domain
@@ -150,6 +150,11 @@ rm -f mutt_ssl.c
 # remove unique id in manual.html because multilib conflicts
 sed -i -r 's/<a id="id[a-z0-9]\+">/<a id="id">/g' doc/manual.html
 
+# fix the shebang in mutt_oauth2.py & preserve the time stamp
+oauth2_script="contrib/mutt_oauth2.py"
+t=$(stat -c %y "${oauth2_script}")
+sed -i "s:^#\!/usr/bin/env\s\+python3\s\?$:#!%{python3}:" "${oauth2_script}"
+touch -d "$t" "${oauth2_script}"
 
 %install
 %make_install
@@ -195,6 +200,7 @@ ln -sf ./muttrc.5 %{buildroot}%{_mandir}/man5/muttrc.local.5
 %{!?_licensedir:%global license %doc}
 %license COPYRIGHT GPL
 %doc ChangeLog NEWS README* UPDATING mutt_ldap_query
+%doc contrib/mutt_oauth2.py contrib/mutt_oauth2.py.README
 %doc contrib/*.rc contrib/sample.* contrib/colors.*
 %doc doc/manual.html doc/manual.txt doc/smime-notes.txt
 %config(noreplace) %{_sysconfdir}/Muttrc
@@ -212,6 +218,15 @@ ln -sf ./muttrc.5 %{buildroot}%{_mandir}/man5/muttrc.local.5
 
 
 %changelog
+* Wed May 19 2021 Dan Čermák <dan.cermak@cgc-instruments.com> - 5:2.0.7-2
+- Ship the mutt_oauth2.py script as well
+
+* Thu May 6 2021 Filip Januš <fjanus@redhat.com> 5:2.0.7-1
+-Rebase to v2.0.7
+
+* Mon Mar 22 2021 Filip Januš <fjanus@redhat.com> 5:2.0.6-1
+- Rebase to upstream version 2.0.6
+
 * Mon Feb 1 2021 Filip Januš <fjanus@redhat.com> -5:2.0.5-1
 - Rebase to upstream version 2.0.5
 - Fix CVE-2021-3181
diff --git a/sources b/sources
index 68af11e..d180af0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (mutt-2.0.5.tar.gz) = 41849d700b88e1b28b51fb90be2a9f6b639e8b111dce914073b66327e4655b5d4ca04dc3aedf2d44a0aa1a80ac3c4fcca6058eae7fb4f71f6b506fbe00a2a740
+SHA512 (mutt-2.0.7.tar.gz) = 1eb689fb9e6aa3cf0bcd0b696c25477cd04b74d8ec93404df071de6dc051e46bbad88131cdf610eb01df4789984707f3791366ae2fda28de2d2739aeb9d34e30