diff --git a/mail/dovecot/Makefile b/mail/dovecot/Makefile
index 46078e6e7e5..931a4eeb82e 100644
--- a/mail/dovecot/Makefile
+++ b/mail/dovecot/Makefile
@@ -1,16 +1,16 @@
-# $OpenBSD: Makefile,v 1.80 2007/06/19 19:18:49 jakob Exp $
+# $OpenBSD: Makefile,v 1.81 2007/07/16 07:09:59 jakob Exp $
 
 SHARED_ONLY=	Yes
 
 COMMENT-server= "compact IMAP/POP3 server"
 COMMENT-sieve=	"sieve mail filtering for Dovecot"
 
-V_DOVECOT=	1.0.1
+V_DOVECOT=	1.0.2
 V_SIEVE=	1.0.1
 
 PKGNAME=	dovecot-${V_DOVECOT}
 PKGNAME-server=	dovecot-${V_DOVECOT}
-PKGNAME-sieve=	dovecot-sieve-${V_SIEVE}p1
+PKGNAME-sieve=	dovecot-sieve-${V_SIEVE}p2
 
 DISTNAME=	dovecot-${V_DOVECOT}
 CATEGORIES=	mail
diff --git a/mail/dovecot/distinfo b/mail/dovecot/distinfo
index 2c33cdf8b17..28eae490470 100644
--- a/mail/dovecot/distinfo
+++ b/mail/dovecot/distinfo
@@ -1,10 +1,10 @@
-MD5 (dovecot-1.0.1.tar.gz) = CHj3RDgkF/zgnYP1scFAMA==
+MD5 (dovecot-1.0.2.tar.gz) = dp8N0nUOfeUh3jOWmZoJ5Q==
 MD5 (sieve/dovecot-sieve-1.0.1.tar.gz) = sHDSF3AJu1Vc1+JccQBH1Q==
-RMD160 (dovecot-1.0.1.tar.gz) = mfs8f2nXUY0P/zzIJFhgyHMdFBQ=
+RMD160 (dovecot-1.0.2.tar.gz) = BjMiXlENHdcjBv8AAD8GXeJeCcU=
 RMD160 (sieve/dovecot-sieve-1.0.1.tar.gz) = m0oqO+UrbfzTFk2CpxObirGoIPk=
-SHA1 (dovecot-1.0.1.tar.gz) = J3Lifs/Er8s3t6++0N65hZn+ZFo=
+SHA1 (dovecot-1.0.2.tar.gz) = AuN58SkBynwDhcGcJogFgn5o4Ow=
 SHA1 (sieve/dovecot-sieve-1.0.1.tar.gz) = JtCuBVDBsmQbfLNpreEyxz+5Ni4=
-SHA256 (dovecot-1.0.1.tar.gz) = RjIg/xT6w4B5ZOZpCCokJxqHK33kRfODJd5TFwN83g0=
+SHA256 (dovecot-1.0.2.tar.gz) = 0zNQdsEE6qCN0BoC25REN5CZiHCkM9pXIKjcebg8agM=
 SHA256 (sieve/dovecot-sieve-1.0.1.tar.gz) = WfFsI6c7Nv+XOoOItgHML2QI4KauT4gsStuDDnLzrGY=
-SIZE (dovecot-1.0.1.tar.gz) = 1739087
+SIZE (dovecot-1.0.2.tar.gz) = 1768818
 SIZE (sieve/dovecot-sieve-1.0.1.tar.gz) = 444126
diff --git a/mail/dovecot/patches/patch-configure b/mail/dovecot/patches/patch-configure
index ba9d5b01bdd..faa3683d198 100644
--- a/mail/dovecot/patches/patch-configure
+++ b/mail/dovecot/patches/patch-configure
@@ -1,7 +1,7 @@
-$OpenBSD: patch-configure,v 1.4 2007/06/19 19:18:49 jakob Exp $
---- configure.orig	Thu Jun 14 14:02:12 2007
-+++ configure	Tue Jun 19 21:03:10 2007
-@@ -20146,6 +20146,7 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtoo
+$OpenBSD: patch-configure,v 1.5 2007/07/16 07:09:59 jakob Exp $
+--- configure.orig	Thu Jul 12 03:33:51 2007
++++ configure	Sun Jul 15 09:42:59 2007
+@@ -20146,6 +20146,7 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
  
  
  
diff --git a/mail/dovecot/patches/patch-dovecot-example_conf b/mail/dovecot/patches/patch-dovecot-example_conf
index 54f89f25e79..ef2a7036f25 100644
--- a/mail/dovecot/patches/patch-dovecot-example_conf
+++ b/mail/dovecot/patches/patch-dovecot-example_conf
@@ -1,6 +1,6 @@
-$OpenBSD: patch-dovecot-example_conf,v 1.37 2007/06/19 19:18:49 jakob Exp $
---- dovecot-example.conf.orig	Wed Jun 13 02:47:39 2007
-+++ dovecot-example.conf	Tue Jun 19 21:03:10 2007
+$OpenBSD: patch-dovecot-example_conf,v 1.38 2007/07/16 07:09:59 jakob Exp $
+--- dovecot-example.conf.orig	Thu Jun 28 16:18:07 2007
++++ dovecot-example.conf	Sun Jul 15 09:47:59 2007
 @@ -10,13 +10,12 @@
  # value inside quotes, eg.: key = "# char and trailing whitespace  "
  
@@ -97,6 +97,15 @@ $OpenBSD: patch-dovecot-example_conf,v 1.37 2007/06/19 19:18:49 jakob 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
+@@ -520,7 +519,7 @@ protocol imap {
+   # Support for dynamically loadable plugins. mail_plugins is a space separated
+   # list of plugins to load.
+   #mail_plugins = 
+-  #mail_plugin_dir = /usr/lib/dovecot/imap
++  #mail_plugin_dir = _PREFIX_/lib/dovecot/imap
+ 
+   # Send IMAP capabilities in greeting message. This makes it unnecessary for
+   # clients to request it with CAPABILITY command, so it saves one round-trip.
 @@ -554,7 +553,7 @@ protocol imap {
    #     but not both. Thunderbird separates these two by forcing server to
    #     accept '/' suffix in mailbox names in subscriptions list.
@@ -129,6 +138,15 @@ $OpenBSD: patch-dovecot-example_conf,v 1.37 2007/06/19 19:18:49 jakob Exp $
  
    # POP3 logout format string:
    #  %t - number of TOP commands
+@@ -627,7 +626,7 @@ protocol pop3 {
+   # Support for dynamically loadable plugins. mail_plugins is a space separated
+   # list of plugins to load.
+   #mail_plugins = 
+-  #mail_plugin_dir = /usr/lib/dovecot/pop3
++  #mail_plugin_dir = _PREFIX_/lib/dovecot/pop3
+ 
+   # Workarounds for various client bugs:
+   #   outlook-no-nuls:
 @@ -637,7 +636,7 @@ protocol pop3 {
    #     Outlook Express and Netscape Mail breaks if end of headers-line is
    #     missing. This option simply sends it if it's missing.
@@ -138,6 +156,19 @@ $OpenBSD: patch-dovecot-example_conf,v 1.37 2007/06/19 19:18:49 jakob Exp $
  }
  
  ##
+@@ -655,10 +654,10 @@ protocol lda {
+   # Support for dynamically loadable plugins. mail_plugins is a space separated
+   # list of plugins to load.
+   #mail_plugins = 
+-  #mail_plugin_dir = /usr/lib/dovecot/lda
++  #mail_plugin_dir = _PREFIX_/lib/dovecot/lda
+ 
+   # Binary to use for sending mails.
+-  #sendmail_path = /usr/lib/sendmail
++  #sendmail_path = /usr/sbin/sendmail
+ 
+   # UNIX socket path to master authentication server to find users.
+   #auth_socket_path = /var/run/dovecot/auth-master
 @@ -669,7 +668,7 @@ protocol lda {
  ##