diff --git a/.cvsignore b/.cvsignore
index 36e487d..81ea469 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,3 @@
-dovecot-20100610.tar.gz
-pigeonhole-snapb877a1db00a5.tar.bz2
+dovecot-20100626.tar.gz
+pigeonhole-snap1def8519d775.tar.bz2
+dovecot-2.0-man-bda145878452.tar.bz2
diff --git a/doveadm.1.gz b/doveadm.1.gz
deleted file mode 100644
index 9663c22..0000000
Binary files a/doveadm.1.gz and /dev/null differ
diff --git a/dovecot.1.gz b/dovecot.1.gz
deleted file mode 100644
index ead5a2e..0000000
Binary files a/dovecot.1.gz and /dev/null differ
diff --git a/dovecot.conf.5 b/dovecot.conf.5
new file mode 100644
index 0000000..a15f1f6
--- /dev/null
+++ b/dovecot.conf.5
@@ -0,0 +1,19 @@
+.TH DOVECOT.CONF 5 2010/06/27 "dovecot" "File Formats and Conventions"
+.SH NAME
+\fBdovecot.conf\fP \- The configuration file for dovecot imap and pop3 server
+
+.SH FULL PATH
+.B /etc/dovecot.conf
+
+.SH DESCRIPTION
+The dovecot.conf file is a configuration file for the
+.BR dovecot (1)
+imap and pop3 server. The dovecot.conf configuration file contains description to all available options. Some of these options are described also in offline wiki documentation placed in /usr/share/doc/dovecot*/wiki/.
+
+For backup purposes unmodified version of dovecot.conf can be found in /usr/share/doc/dovecot-<version>/example-config/dovecot.conf.default
+
+.SH "SEE ALSO"
+.BR doveadm (1),
+.BR dovecot (1),
+.I /usr/share/doc/dovecot*/wiki/
+.I /usr/share/doc/dovecot*/dovecot.conf.default
diff --git a/dovecot.conf.5.gz b/dovecot.conf.5.gz
deleted file mode 100644
index 986d375..0000000
Binary files a/dovecot.conf.5.gz and /dev/null differ
diff --git a/dovecot.spec b/dovecot.spec
index 32096a2..060ec60 100644
--- a/dovecot.spec
+++ b/dovecot.spec
@@ -1,11 +1,11 @@
-%global betasuffix .beta5
-%global snapsuffix 20100610
+%global betasuffix .beta6
+%global snapsuffix 20100626
 
 Summary: Secure imap and pop3 server
 Name: dovecot
 Epoch: 1
 Version: 2.0
-Release: 0.14%{?betasuffix}.%{?snapsuffix}%{?dist}
+Release: 0.15%{?betasuffix}.%{?snapsuffix}%{?dist}
 #dovecot itself is MIT, a few sources are PD, pigeonhole is LGPLv2
 License: MIT and LGPLv2
 Group: System Environment/Daemons
@@ -20,18 +20,16 @@ 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 b877a1db00a5
+%global phsnap 1def8519d775
 Source8: pigeonhole-snap%{phsnap}.tar.bz2
 Source9: dovecot.sysconfig
-
-#http://wiki2.dovecot.org/ManPages/dovecot?action=AttachFile&do=view&target=dovecot.1.gz
-Source12: dovecot.1.gz
-
-#http://wiki2.dovecot.org/ManPages/doveadm?action=AttachFile&do=view&target=doveadm.1.gz
-Source13: doveadm.1.gz
+#Source10: http://hg.localdomain.org/dovecot-2.0-man/archive/tip.tar.bz2
+#we use this ^^^ repository snapshost just renamed to contain last commit in name
+%global mansnap bda145878452
+Source10: dovecot-2.0-man-%{mansnap}.tar.bz2
 
 #our own
-Source14: dovecot.conf.5.gz
+Source14: dovecot.conf.5
 
 # 3x Fedora/RHEL specific
 Patch1: dovecot-2.0-defaultconfig.patch
@@ -108,12 +106,13 @@ This package provides the development files for dovecot.
 
 %prep
 %setup -q -n %{name}-%{version}%{?betasuffix}
-%setup -q  -n %{name}-%{version}%{?betasuffix} -D -T -a 8 
+%setup -q -n %{name}-%{version}%{?betasuffix} -D -T -a 8 -a 10
 
 %patch1 -p1 -b .default-settings
 %patch2 -p1 -b .mkcert-permissions
 %patch3 -p1 -b .mkcert-paths
 %patch4 -p1 -b .betahotfix
+sed -i 's|^sysconfdir *=|sysconfdir =/etc|' dovecot-2-0-man-%{mansnap}/doc/man/Makefile
 
 %build
 #autotools hacks can be removed later, nightly does not support --docdir
@@ -161,6 +160,8 @@ autoreconf -fiv
 make %{?_smp_mflags}
 popd
 
+make -C dovecot-2-0-man-%{mansnap}/doc/man
+
 %install
 rm -rf $RPM_BUILD_ROOT
 
@@ -170,6 +171,10 @@ pushd dovecot-2-0-pigeonhole-%{phsnap}
 make install DESTDIR=$RPM_BUILD_ROOT
 popd
 
+pushd dovecot-2-0-man-%{mansnap}/doc/man
+install -D -m644 *.1 $RPM_BUILD_ROOT%{_mandir}/man1/
+popd
+
 #move doc dir back to build dir so doc macro in files section can use it
 mv $RPM_BUILD_ROOT/%{_docdir}/%{name}-%{version} %{_builddir}/%{name}-%{version}%{?betasuffix}/docinstall
 
@@ -181,8 +186,6 @@ install -p -D -m 600 %{SOURCE9} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/dovecot
 
 #install man pages
 mkdir -p $RPM_BUILD_ROOT%{_mandir}/{man1,man5}
-install -p -m 644 %{SOURCE12} $RPM_BUILD_ROOT%{_mandir}/man1/
-install -p -m 644 %{SOURCE13} $RPM_BUILD_ROOT%{_mandir}/man1/
 install -p -m 644 %{SOURCE14} $RPM_BUILD_ROOT%{_mandir}/man5/
 
 # generate ghost .pem files
@@ -335,8 +338,11 @@ make check
 %attr(0750,root,dovenull) %dir /var/run/dovecot/login
 %attr(0750,dovecot,dovecot) %dir /var/lib/dovecot
 
-%{_mandir}/man1/doveadm.1.gz
-%{_mandir}/man1/dovecot.1.gz
+%{_mandir}/man1/deliver.1.gz
+%{_mandir}/man1/doveadm*.1.gz
+%{_mandir}/man1/doveconf.1.gz
+%{_mandir}/man1/dovecot*.1.gz
+%{_mandir}/man1/dsync.1.gz
 %{_mandir}/man5/dovecot.conf.5.gz
 
 %files devel
@@ -376,6 +382,13 @@ make check
 %{_libdir}/%{name}/dict/libdriver_pgsql.so
 
 %changelog
+* Mon Jun 28 2010 Michal Hlavinka <mhlavink@redhat.com> - 1:2.0-0.15.beta6.20100626
+- updated dovecot, pigeonhole and man pages
+- moved disable_plaintext_auth to 10-auth.conf
+- mdbox: Fixed assert-crash on storage rebuild if file got lost
+- lib-charset: Don't assert-crash when iconv() skips lots of invalid input
+- master: Fixed crash on deinit (maybe also on reload)
+
 * Thu Jun 10 2010 Michal Hlavinka <mhlavink@redhat.com> - 1:2.0-0.14.beta5.20100610
 - dovecot updated 
 - lib-storage: Fixed accessing uncommitted saved mails with dsync
diff --git a/sources b/sources
index 241f5df..d31868c 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,3 @@
-0b50610722d2acb44e051557a1a91333  dovecot-20100610.tar.gz
-9f7ba2e8b81845cd81e87a4e98df494e  pigeonhole-snapb877a1db00a5.tar.bz2
+ff439e7dc88c4b56048be53794a1ecba  dovecot-20100626.tar.gz
+0431e36f0858323547cca0787d2e9ea4  pigeonhole-snap1def8519d775.tar.bz2
+621307ab5ebab62d8df68107258adbec  dovecot-2.0-man-bda145878452.tar.bz2