diff --git a/dovecot/.md5sum b/dovecot/.md5sum
index 60716ec22..de282ac2a 100644
--- a/dovecot/.md5sum
+++ b/dovecot/.md5sum
@@ -1,3 +1,3 @@
 7eaa958040fbd7169c86134439d4b632  dovecot
-3e5717d13e3d6b32d3f4b809df397dbf  dovecot-1.2.4.tar.gz
-2fcfdb98f4ae8d52be5cbbceca9980e7  dovecot-config.patch
+8b057903d6a527dac964b51c5638c625  dovecot-1.2.5.tar.gz
+874e21f6db1c6bef18269af16059ae7e  dovecot-config.patch
diff --git a/dovecot/Pkgfile b/dovecot/Pkgfile
index 1ca118c58..b89688dd2 100644
--- a/dovecot/Pkgfile
+++ b/dovecot/Pkgfile
@@ -4,7 +4,7 @@
 # Depends on:  zlib bzip2 openssl
 
 name=dovecot
-version=1.2.4
+version=1.2.5
 release=1
 source=(http://dovecot.org/releases/1.2/$name-$version.tar.gz \
         dovecot-config.patch dovecot)
diff --git a/dovecot/dovecot-config.patch b/dovecot/dovecot-config.patch
index 790137c4a..3a1b8c212 100644
--- a/dovecot/dovecot-config.patch
+++ b/dovecot/dovecot-config.patch
@@ -1,6 +1,6 @@
-diff -Nru dovecot-1.2.rc4.orig/dovecot-example.conf dovecot-1.2.rc4/dovecot-example.conf
---- dovecot-1.2.rc4.orig/dovecot-example.conf	2009-05-18 12:42:23.000000000 +0200
-+++ dovecot-1.2.rc4/dovecot-example.conf	2009-05-18 12:44:52.000000000 +0200
+diff -Nru dovecot-1.2.5.orig/dovecot-example.conf dovecot-1.2.5/dovecot-example.conf
+--- dovecot-1.2.5.orig/dovecot-example.conf	2009-09-14 09:32:16.000000000 +0200
++++ dovecot-1.2.5/dovecot-example.conf	2009-09-14 09:32:30.000000000 +0200
 @@ -17,11 +17,11 @@
  # --sysconfdir=/etc --localstatedir=/var --with-ssldir=/etc/ssl
  
@@ -121,9 +121,9 @@ diff -Nru dovecot-1.2.rc4.orig/dovecot-example.conf dovecot-1.2.rc4/dovecot-exam
 -  #pop3_uidl_format = %08Xu%08Xv
 +  pop3_uidl_format = %08Xu%08Xv
  
-   # POP3 logout format string:
-   #  %i - total number of bytes read from client
-@@ -720,7 +720,7 @@
+   # Permanently save UIDLs sent to POP3 clients, so pop3_uidl_format changes
+   # won't change those UIDLs. Currently this works only with Maildir.
+@@ -724,7 +724,7 @@
    #deliver_log_format = msgid=%m: %$
  
    # Binary to use for sending mails.
@@ -132,7 +132,7 @@ diff -Nru dovecot-1.2.rc4.orig/dovecot-example.conf dovecot-1.2.rc4/dovecot-exam
  
    # Subject: header to use for rejection mails. You can use the same variables
    # as for rejection_reason below.
-@@ -739,7 +739,7 @@
+@@ -743,7 +743,7 @@
  ##
  
  # Executable location
@@ -141,7 +141,7 @@ diff -Nru dovecot-1.2.rc4.orig/dovecot-example.conf dovecot-1.2.rc4/dovecot-exam
  
  # Set max. process size in megabytes.
  #auth_process_size = 256
-@@ -868,7 +868,7 @@
+@@ -872,7 +872,7 @@
    # database (passwd usually), you can use static userdb.
    # REMEMBER: You'll need /etc/pam.d/dovecot file created for PAM
    # authentication to actually work. <doc/wiki/PasswordDatabase.PAM.txt>
@@ -150,7 +150,7 @@ diff -Nru dovecot-1.2.rc4.orig/dovecot-example.conf dovecot-1.2.rc4/dovecot-exam
      # [session=yes] [setcred=yes] [failure_show_msg=yes] [max_requests=<n>]
      # [cache_key=<key>] [<service name>]
      #
-@@ -901,7 +901,7 @@
+@@ -905,7 +905,7 @@
      #   args = session=yes %Ls
      #   args = cache_key=%u dovecot
      #args = dovecot
@@ -159,7 +159,7 @@ diff -Nru dovecot-1.2.rc4.orig/dovecot-example.conf dovecot-1.2.rc4/dovecot-exam
  
    # System users (NSS, /etc/passwd, or similiar)
    # In many systems nowadays this uses Name Service Switch, which is
-@@ -914,10 +914,10 @@
+@@ -918,10 +918,10 @@
    # Shadow passwords for system users (NSS, /etc/shadow or similiar).
    # Deprecated by PAM nowadays.
    # <doc/wiki/PasswordDatabase.Shadow.txt>