diff --git a/mail/dovecot/Makefile b/mail/dovecot/Makefile
index 40e5526e5545..c623a6b5f9f4 100644
--- a/mail/dovecot/Makefile
+++ b/mail/dovecot/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.69 2006/10/14 09:33:08 ghen Exp $
+# $NetBSD: Makefile,v 1.70 2006/10/16 06:55:47 ghen Exp $
 
-DISTNAME=		dovecot-1.0.rc9
+DISTNAME=		dovecot-1.0.rc10
 PKGNAME=		${DISTNAME:S/.rc/rc/}
 CATEGORIES=		mail
 MASTER_SITES=		http://www.dovecot.org/releases/
diff --git a/mail/dovecot/distinfo b/mail/dovecot/distinfo
index ee97d73a1756..d0f32dfe43ab 100644
--- a/mail/dovecot/distinfo
+++ b/mail/dovecot/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.42 2006/10/14 09:33:08 ghen Exp $
+$NetBSD: distinfo,v 1.43 2006/10/16 06:55:47 ghen Exp $
 
-SHA1 (dovecot-1.0.rc9.tar.gz) = 5d643f153f9f180b1410b7548063701978469a3f
-RMD160 (dovecot-1.0.rc9.tar.gz) = 17f2f5d20f49df92f84e79debce0172a770b0dfb
-Size (dovecot-1.0.rc9.tar.gz) = 1449023 bytes
+SHA1 (dovecot-1.0.rc10.tar.gz) = 3c10464b0a5d3b285a9528c11e4057b0afa11cb0
+RMD160 (dovecot-1.0.rc10.tar.gz) = 1dddb6b620ac373703af845e59ed069919c37377
+Size (dovecot-1.0.rc10.tar.gz) = 1452437 bytes
 SHA1 (patch-aa) = 6258057d49add91f06d4dd51ded72e42f6774354
-SHA1 (patch-ab) = ef97d29e1a8d8136d49fdd06583d6a17077660c6
+SHA1 (patch-ab) = 6b6b1dcc9201eca1cedbea5daf6071403e04f14d
 SHA1 (patch-ag) = d2dd85d06158ab629f5e394a7f75d9862a67b58f
diff --git a/mail/dovecot/patches/patch-ab b/mail/dovecot/patches/patch-ab
index bfe5a70a2fc8..b9f119e8d746 100644
--- a/mail/dovecot/patches/patch-ab
+++ b/mail/dovecot/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.16 2006/10/09 19:06:57 ghen Exp $
+$NetBSD: patch-ab,v 1.17 2006/10/16 06:55:47 ghen Exp $
 
---- dovecot-example.conf.orig	2006-10-09 20:54:38.000000000 +0200
+--- dovecot-example.conf.orig	2006-10-16 00:12:31.000000000 +0200
 +++ dovecot-example.conf
 @@ -7,17 +7,14 @@
  # value inside quotes, eg.: key = "# char and trailing whitespace  "
@@ -31,7 +31,7 @@ $NetBSD: patch-ab,v 1.16 2006/10/09 19:06:57 ghen Exp $
  
  # PEM encoded X.509 SSL/TLS certificate and private key. They're opened before
  # dropping root privileges, so keep the key file unreadable by anyone but
-@@ -468,19 +465,19 @@
+@@ -470,19 +467,19 @@
  
  protocol imap {
    # Login executable location.
@@ -55,7 +55,7 @@ $NetBSD: patch-ab,v 1.16 2006/10/09 19:06:57 ghen Exp $
  
    # Maximum IMAP command line length in bytes. Some clients generate very long
    # command lines with huge mailboxes, so you may need to raise this if you get
-@@ -490,7 +487,7 @@ protocol imap {
+@@ -492,7 +489,7 @@ protocol imap {
    # Support for dynamically loadable plugins. mail_plugins is a space separated
    # list of plugins to load.
    #mail_plugins = 
@@ -64,7 +64,7 @@ $NetBSD: patch-ab,v 1.16 2006/10/09 19:06:57 ghen Exp $
  
    # Send IMAP capabilities in greeting message. This makes it unnecessary for
    # clients to request it with CAPABILITY command, so it saves one round-trip.
-@@ -530,11 +527,11 @@ protocol imap {
+@@ -532,11 +529,11 @@ protocol imap {
  
  protocol pop3 {
    # Login executable location.
@@ -78,7 +78,7 @@ $NetBSD: patch-ab,v 1.16 2006/10/09 19:06:57 ghen Exp $
  
    # Don't try to set mails non-recent or seen with POP3 sessions. This is
    # mostly intended to reduce disk I/O. With maildir it doesn't move files
-@@ -593,7 +590,7 @@ protocol pop3 {
+@@ -595,7 +592,7 @@ protocol pop3 {
    # Support for dynamically loadable plugins. mail_plugins is a space separated
    # list of plugins to load.
    #mail_plugins = 
@@ -87,7 +87,7 @@ $NetBSD: patch-ab,v 1.16 2006/10/09 19:06:57 ghen Exp $
  
    # Workarounds for various client bugs:
    #   outlook-no-nuls:
-@@ -621,10 +618,10 @@ protocol lda {
+@@ -623,10 +620,10 @@ protocol lda {
    # Support for dynamically loadable plugins. mail_plugins is a space separated
    # list of plugins to load.
    #mail_plugins = 
@@ -100,7 +100,7 @@ $NetBSD: patch-ab,v 1.16 2006/10/09 19:06:57 ghen Exp $
  
    # UNIX socket path to master authentication server to find users.
    #auth_socket_path = /var/run/dovecot/auth-master
-@@ -635,7 +632,7 @@ protocol lda {
+@@ -637,7 +634,7 @@ protocol lda {
  ##
  
  # Executable location
@@ -109,7 +109,7 @@ $NetBSD: patch-ab,v 1.16 2006/10/09 19:06:57 ghen Exp $
  
  # Set max. process size in megabytes.
  #auth_process_size = 256
-@@ -747,7 +744,7 @@ auth default {
+@@ -751,7 +748,7 @@ auth default {
    # database (passwd usually), you can use static userdb.
    # REMEMBER: You'll need /etc/pam.d/dovecot file created for PAM
    # authentication to actually work.
@@ -118,7 +118,7 @@ $NetBSD: patch-ab,v 1.16 2006/10/09 19:06:57 ghen Exp $
      #  [session=yes] [setcred=yes] [cache_key=<key>] [<service name>]
      #
      # session=yes makes Dovecot open and immediately close PAM session. Some
-@@ -775,13 +772,13 @@ auth default {
+@@ -779,14 +776,14 @@ auth default {
      #   args = session=yes *
      #   args = cache_key=%u dovecot
      #args = dovecot
@@ -127,7 +127,8 @@ $NetBSD: patch-ab,v 1.16 2006/10/09 19:06:57 ghen Exp $
  
    # /etc/passwd or similar, using getpwnam()
    # In many systems nowadays this uses Name Service Switch, which is
-   # configured in /etc/nsswitch.conf.
+   # configured in /etc/nsswitch.conf. WARNING: nss_ldap is known to be broken
+   # with Dovecot. Don't use it, or users might log in as each others!
 -  #passdb passwd {
 -  #}
 +  passdb passwd {