diff --git a/.cvsignore b/.cvsignore
index 0b0d39d..78c27e6 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,2 @@
-dovecot-20100707.tar.gz
-pigeonhole-snape6c049bf72a9.tar.bz2
+dovecot-20100712.tar.gz
+pigeonhole-snap843ba8e66e1b.tar.bz2
diff --git a/dovecot-2.0-betahotfix.patch b/dovecot-2.0-betahotfix.patch
index cc5a61c..e69de29 100644
--- a/dovecot-2.0-betahotfix.patch
+++ b/dovecot-2.0-betahotfix.patch
@@ -1,46 +0,0 @@
-diff -up dovecot-2.0.rc1/src/dsync/test-dsync-brain.c.betahotfix dovecot-2.0.rc1/src/dsync/test-dsync-brain.c
---- dovecot-2.0.rc1/src/dsync/test-dsync-brain.c.betahotfix	2010-07-02 04:00:08.000000000 +0200
-+++ dovecot-2.0.rc1/src/dsync/test-dsync-brain.c	2010-07-07 13:45:59.887603676 +0200
-@@ -211,9 +211,9 @@ static void test_dsync_brain(void)
- 	test_assert(!test_dsync_worker_next_box_event(src_test_worker, &box_event));
- 	test_assert(!test_dsync_worker_next_box_event(dest_test_worker, &box_event));
- 
-+	dsync_brain_deinit(&brain);
- 	dsync_worker_deinit(&src_worker);
- 	dsync_worker_deinit(&dest_worker);
--	dsync_brain_deinit(&brain);
- 
- 	test_end();
- }
-@@ -268,9 +268,9 @@ static void test_dsync_brain_full(void)
- 	test_assert(!test_dsync_worker_next_box_event(src_test_worker, &box_event));
- 	test_assert(!test_dsync_worker_next_box_event(dest_test_worker, &box_event));
- 
-+	dsync_brain_deinit(&brain);
- 	dsync_worker_deinit(&src_worker);
- 	dsync_worker_deinit(&dest_worker);
--	dsync_brain_deinit(&brain);
- 
- 	test_end();
- }
-diff -up dovecot-2.0.rc1/src/plugins/fts-solr/fts-backend-solr.c.betahotfix dovecot-2.0.rc1/src/plugins/fts-solr/fts-backend-solr.c
---- dovecot-2.0.rc1/src/plugins/fts-solr/fts-backend-solr.c.betahotfix	2010-06-23 04:00:03.000000000 +0200
-+++ dovecot-2.0.rc1/src/plugins/fts-solr/fts-backend-solr.c	2010-07-07 13:39:18.847854145 +0200
-@@ -57,7 +57,7 @@ static void fts_box_name_get_root(struct
- 		*ns = (*ns)->alias_for;
- 
- 	if (**name == '\0' && *ns != orig_ns &&
--	    ((*ns)->flags & NAMESPACE_FLAG_INBOX) != 0) {
-+	    ((*ns)->flags & NAMESPACE_FLAG_INBOX_USER) != 0) {
- 		/* ugly workaround to allow selecting INBOX from a Maildir/
- 		   when it's not in the inbox=yes namespace. */
- 		*name = "INBOX";
-@@ -747,7 +747,7 @@ static bool solr_virtual_uid_map(const c
- 	bool convert_inbox;
- 
- 	ns = solr_get_namespaces(ctx->backend, ctx->box, ns_prefix);
--	convert_inbox = (ns->flags & NAMESPACE_FLAG_INBOX) != 0 &&
-+	convert_inbox = (ns->flags & NAMESPACE_FLAG_INBOX_USER) != 0 &&
- 		strcmp(mailbox, "INBOX") == 0;
- 	for (; ns != NULL; ns = ns->alias_chain_next) {
- 		vname = convert_inbox ? ns->prefix :
diff --git a/dovecot.spec b/dovecot.spec
index 7cbe74d..9d63285 100644
--- a/dovecot.spec
+++ b/dovecot.spec
@@ -1,11 +1,11 @@
-%global betasuffix .rc1
-%global snapsuffix 20100707
+%global betasuffix .rc2
+%global snapsuffix 20100712
 
 Summary: Secure imap and pop3 server
 Name: dovecot
 Epoch: 1
 Version: 2.0
-Release: 0.16%{?betasuffix}.%{?snapsuffix}%{?dist}
+Release: 0.17%{?betasuffix}.%{?snapsuffix}%{?dist}
 #dovecot itself is MIT, a few sources are PD, pigeonhole is LGPLv2
 License: MIT and LGPLv2
 Group: System Environment/Daemons
@@ -20,7 +20,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 e6c049bf72a9
+%global phsnap 843ba8e66e1b
 Source8: pigeonhole-snap%{phsnap}.tar.bz2
 Source9: dovecot.sysconfig
 
@@ -364,6 +364,15 @@ make check
 %{_libdir}/%{name}/dict/libdriver_pgsql.so
 
 %changelog
+* Mon Jul 12 2010 Michal Hlavinka <mhlavink@redhat.com> - 1:2.0-0.17.rc2.20100712
+- dovecot and pigeonhole updated
+- fixed a crash with empty mail_plugins
+- fixed sharing INBOX to other users
+- director+LMTP proxy wasn't working correctly
+- v1.x config parser failed with some settings if pigeonhole wasn't installed.
+- virtual: If non-matching messages weren't expunged within same session,
+  they never got expunged.
+
 * Wed Jul 07 2010 Michal Hlavinka <mhlavink@redhat.com> - 1:2.0-0.16.rc1.20100707
 - updated dovecot and pigeonhole
 - a lot of dsync fixes
diff --git a/sources b/sources
index bbe1b10..3091540 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-f7c1f1e1a88773512eed8047f28a1f1b  dovecot-20100707.tar.gz
-e4f1bf79760b2ff58fa4c84eb886d5fe  pigeonhole-snape6c049bf72a9.tar.bz2
+e16cbe219936e53d872478fcce79cc21  dovecot-20100712.tar.gz
+f8fc07408dbc1ae286ec49036350dcf6  pigeonhole-snap843ba8e66e1b.tar.bz2