diff --git a/.gitignore b/.gitignore
index a1cf8a6..614ff9e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -39,3 +39,4 @@ mutt-1.5.23.tar.gz
 /mutt-1.14.6.tar.gz
 /mutt-1.14.7.tar.gz
 /mutt-2.0.2.tar.gz
+/mutt-2.0.5.tar.gz
diff --git a/mutt.spec b/mutt.spec
index b7c05f4..b7a23cd 100644
--- a/mutt.spec
+++ b/mutt.spec
@@ -19,8 +19,8 @@
 
 Summary: A text mode mail user agent
 Name: mutt
-Version: 2.0.2
-Release: 2%{?dist}
+Version: 2.0.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
+* 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
+
 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 5:2.0.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
 
diff --git a/sources b/sources
index e1eae2e..68af11e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (mutt-2.0.2.tar.gz) = 5dea02edf60b33e4873806481aa4256f91d90b05de99a9eccc620c459bd924197b656f85eb5a31757a61675389e6c4d76571128a757cfda255240934e82eec29
+SHA512 (mutt-2.0.5.tar.gz) = 41849d700b88e1b28b51fb90be2a9f6b639e8b111dce914073b66327e4655b5d4ca04dc3aedf2d44a0aa1a80ac3c4fcca6058eae7fb4f71f6b506fbe00a2a740