diff --git a/.gitignore b/.gitignore
index 1eda3d4..e6eb7ae 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
 dovecot-2.0.rc3.tar.gz
 pigeonhole-snap01ee63b788c9.tar.bz2
+dovecot-2.0.rc4.tar.gz
+pigeonhole-snapcac6acdc4d0e.tar.bz2
diff --git a/dovecot.spec b/dovecot.spec
index e8d06a5..a7de3f1 100644
--- a/dovecot.spec
+++ b/dovecot.spec
@@ -1,10 +1,10 @@
-%global betasuffix .rc3
+%global betasuffix .rc4
 
 Summary: Secure imap and pop3 server
 Name: dovecot
 Epoch: 1
 Version: 2.0
-Release: 0.19%{?betasuffix}%{?dist}
+Release: 0.20%{?betasuffix}%{?dist}
 #dovecot itself is MIT, a few sources are PD, pigeonhole is LGPLv2
 License: MIT and LGPLv2
 Group: System Environment/Daemons
@@ -17,7 +17,7 @@ Source1: dovecot.init
 Source2: dovecot.pam
 #Source8: http://hg.rename-it.nl/dovecot-2.0-pigeonhole/archive/tip.tar.bz2
 #we use this ^^^ repository snapshost just renamed to contain last commit in name
-%global phsnap 01ee63b788c9
+%global phsnap cac6acdc4d0e
 Source8: pigeonhole-snap%{phsnap}.tar.bz2
 Source9: dovecot.sysconfig
 
@@ -361,6 +361,13 @@ make check
 %{_libdir}/%{name}/dict/libdriver_pgsql.so
 
 %changelog
+* Thu Aug 05 2010 Michal Hlavinka <mhlavink@redhat.com> - 1:2.0-0.20.rc4
+- dovecot and pigeonhole updated
+- doveadm mailbox status: Fixed listing non-ASCII mailbox names. 
+- doveadm fetch: Fixed output when fetching message header or body
+- doveadm director map/add/remove: Fixed handling IP address as parameter. 
+- dsync: A few more fixes
+
 * Wed Jul 21 2010 Michal Hlavinka <mhlavink@redhat.com> - 1:2.0-0.19.rc3
 - dovecot and pigeonhole updated
 - fixed lda + sieve crash
diff --git a/sources b/sources
index 43f07e9..23f3e52 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-a13c486530265aa97eef6518cee62adf  dovecot-2.0.rc3.tar.gz
-a60f905521d3356c26aa875454498214  pigeonhole-snap01ee63b788c9.tar.bz2
+1eaec88e5103415db7c05bfaefe2702c  dovecot-2.0.rc4.tar.gz
+0c96d852036cb5ddda57805b72eb8a82  pigeonhole-snapcac6acdc4d0e.tar.bz2