diff --git a/.cvsignore b/.cvsignore
index dc727c2..58ca606 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-balsa-2.3.17.tar.bz2
+balsa-2.3.20.tar.bz2
diff --git a/balsa.spec b/balsa.spec
index 236821e..49d623d 100644
--- a/balsa.spec
+++ b/balsa.spec
@@ -1,7 +1,7 @@
 %define config_opts --prefix=%{_prefix} --sysconfdir=%{_sysconfdir} --mandir=%{_mandir} --libdir=%{_libdir} --bindir=%{_bindir} --includedir=%{_includedir} --datadir=%{_datadir} --disable-more-warnings --with-ssl --with-gss --with-gtkspell
 
 Name:           balsa
-Version:        2.3.17
+Version:        2.3.20
 Release:        1%{?dist}
 Summary:        Mail Client
 
@@ -102,6 +102,9 @@ fi
 
 
 %changelog
+* Fri Sep  7 2007 Pawel Salek <pawsa@theochem.kth.se> - 2.3.20-1
+- update to upstream 2.3.20, fix #474366.
+
 * Wed Jul  4 2007 Pawel Salek <pawsa@theochem.kth.se> - 2.3.17-1
 - update to upstream 2.3.17.
 
@@ -135,50 +138,3 @@ fi
 * Sat Jan  7 2006 Pawel Salek <pawsa@theochem.kth.se> - 2.3.9-1
 - update to 2.3.9.
 
-* Wed Dec 28 2005 Pawel Salek <pawsa@theochem.kth.se> - 2.3.8-1
-- update to 2.3.8; enable gtkhtml and gtkspell.
-
-* Sun Dec  4 2005 Pawel Salek <pawsa@theochem.kth.se> - 2.3.7-1
-- update to upstream version 2.3.7. Use gmime-2.1.17
-
-* Wed Oct 23 2005 Pawel Salek <pawsa@theochem.kth.se> - 2.3.6-1
-- update to upstream version 2.3.6
-
-* Wed Oct 19 2005 Pawel Salek <pawsa@theochem.kth.se> - 2.3.5
-- update to upstream version 2.3.5
-
-* Tue Jul  5 2005 Pawel Salek <pawsa@theochem.kth.se> - 2.3.4
-- update to upstream version 2.3.4
-
-* Tue Jun 14 2005 Pawel Salek <pawsa@theochem.kth.se> - 2.3.3
-- directory ownership cleanup (credit to Michael Schwendt).
-
-* Mon Jun 13 2005 Pawel Salek <pawsa@theochem.kth.se> - 2.3.3
-- add missing scrollkeeper dependency.
-
-* Mon Jun 13 2005 Pawel Salek <pawsa@theochem.kth.se> - 2.3.3
-- libesmtp imported to fedora extras - reenable.
-
-* Sat Jun 11 2005 Pawel Salek <pawsa@theochem.kth.se> - 2.3.3
-- Implement the reviewers's suggestions as on fedora-extras-list
-
-* Tue Jun  7 2005 Pawel Salek <pawsa@theochem.kth.se> - 2.3.3-1
-- bump version to 2.3.3
-- add libesmtp-devel dependency.
-- do not forget about config_opts.
-
-* Fri May 20 2005 Pawel Salek <pawsa@theochem.kth.se> - 2.3.2-1
-- adapt to Fedora Extras template.
-
-
-* Sat Jul 26 2003 Misu Moldovan <dumol@go.ro>
-- further split the Red Hat and Mandrake sections
-- fix Mandrake 9.x dependencies
-
-* Mon Sep 16 2002 Pawel Salek <pawsa@theochem.kth.se>
-- adapt to GNOME2 requirements.
-
-* Sun Jun 24 2001 Spider <spider@darkmere.wanfear.com>
-- remove all defined paths to user-specified. 
-- update configures, locales, update esmtp as a requires/buildrequires 
-
diff --git a/sources b/sources
index 77ae3de..268e349 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0e29e5be9287bf921b68e624c07b1dd2  balsa-2.3.17.tar.bz2
+64763beb79731649da7e327b1140843a  balsa-2.3.20.tar.bz2