diff --git a/.cvsignore b/.cvsignore
index 4f70b32..6f0c864 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-dovecot-0.99.10.4.tar.gz
+dovecot-0.99.10.5.tar.gz
diff --git a/dovecot-0.99.10.4-conf.patch b/dovecot-0.99.10.4-conf.patch
index e56f52a..b6934b8 100644
--- a/dovecot-0.99.10.4-conf.patch
+++ b/dovecot-0.99.10.4-conf.patch
@@ -39,13 +39,11 @@ diff -urN dovecot-0.99.10.4.orig/dovecot-example.conf dovecot-0.99.10.4/dovecot-
  
  # Should we create dotlock file even when we want only a read-lock? Setting
  # this to yes hurts the performance when the mailbox is accessed simultaneously
-@@ -380,8 +380,8 @@
+@@ -380,7 +380,8 @@
  #   vpopmail: vpopmail library
  #   ldap <config path>: LDAP, see doc/dovecot-ldap.conf
  #   pgsql <config path>: a PostgreSQL database, see doc/dovecot-pgsql.conf
--#auth_userdb = passwd
--auth_userdb = pgsql /usr/local/etc/dovecot-pgsql.conf
-+auth_userdb = passwd
+ auth_userdb = passwd
 +# auth_userdb = pgsql /usr/local/etc/dovecot-pgsql.conf
  
  # Where password database is kept:
diff --git a/dovecot.spec b/dovecot.spec
index 9a6fa2c..3e33e95 100644
--- a/dovecot.spec
+++ b/dovecot.spec
@@ -1,7 +1,7 @@
 Summary: Dovecot Secure imap server
 Name: dovecot
-Version: 0.99.10.4
-Release: 4
+Version: 0.99.10.5
+Release: 1
 License: GPL
 Group: System Environment/Daemons
 Source: %{name}-%{version}.tar.gz
@@ -10,9 +10,6 @@ Source2: dovecot.pam
 Patch100: dovecot-0.99.10.4-conf.patch
 
 # Patches 500+ from upstream fixes
-Patch500: dovecot-0.99.10.4-maildir.patch
-Patch501: dovecot-0.99.10.4-customflags-fix.patch
-Patch502: dovecot-0.99.10.4-imap-fetch-body-section.patch
 URL: http://dovecot.procontrol.fi/
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: openssl-devel
@@ -33,10 +30,6 @@ in either of maildir or mbox formats.
 
 %patch100 -p1 -b .config
 
-%patch500 -p0 -b .maildir
-%patch501 -p0 -b .customflags-fix
-%patch502 -p1 -b .imap-fetch-body-section
-
 %build
 %configure --with-ssl=openssl --with-ssldir=/usr/share/ssl --with-ldap
 
@@ -118,6 +111,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu May 27 2004 David Woodhouse <dwmw2@redhat.com> 0.99.10.5-1
+- Update to 0.99.10.5 to fix maildir segfaults (#123022)
+
 * Fri May 07 2004 Warren Togami <wtogami@redhat.com> 0.99.10.4-4
 - default auth config that is actually usable
 - Timo Sirainen (author) suggested functionality fixes
diff --git a/sources b/sources
index c077716..51e6fbf 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-81eda7985e99d28acd6d286aa0e13e07  dovecot-0.99.10.4.tar.gz
+acda02c8bdcff5e194a8b9227ccb74b5  dovecot-0.99.10.5.tar.gz