diff --git a/.gitignore b/.gitignore
index ebbeee1..5879f27 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,3 +26,4 @@ pigeonhole-snap0592366457df.tar.bz2
 /dovecot-2.0.9.tar.gz
 /dovecot-2.0.11.tar.gz
 /dovecot-2.0.12.tar.gz
+/dovecot-2.0-pigeonhole-0.2.3.tar.gz
diff --git a/dovecot.spec b/dovecot.spec
index 04401a0..b2e5dc9 100644
--- a/dovecot.spec
+++ b/dovecot.spec
@@ -2,7 +2,7 @@ Summary: Secure imap and pop3 server
 Name: dovecot
 Epoch: 1
 Version: 2.0.12
-Release: 1%{?dist}
+Release: 2%{?dist}
 #dovecot itself is MIT, a few sources are PD, pigeonhole is LGPLv2
 License: MIT and LGPLv2
 Group: System Environment/Daemons
@@ -13,7 +13,7 @@ URL: http://www.dovecot.org/
 Source: http://www.dovecot.org/releases/2.0/%{name}-%{version}.tar.gz
 Source1: dovecot.init
 Source2: dovecot.pam
-%global pigeonholever 0.2.2
+%global pigeonholever 0.2.3
 Source8: http://www.rename-it.nl/dovecot/2.0/dovecot-2.0-pigeonhole-%{pigeonholever}.tar.gz
 Source9: dovecot.sysconfig
 Source10: dovecot.tmpfilesd
@@ -394,6 +394,14 @@ make check
 %{_libdir}/%{name}/dict/libdriver_pgsql.so
 
 %changelog
+* Fri Apr 15 2011 Michal Hlavinka <mhlavink@redhat.com> - 1:2.0.12-2
+- pigeonhole updated to 0.2.3, which includes:
+- managesieve: fixed bug in UTF-8 checking of string values
+- sieve command line tools now avoid initializing the mail store unless necessary
+- removed header MIME-decoding to fix erroneous address parsing
+- fixed segfault bug in extension configuration, triggered when unknown
+  extension is mentioned in sieve_extensions setting.
+
 * Wed Apr 13 2011 Michal Hlavinka <mhlavink@redhat.com> - 1:2.0.12-1
 - dbox: Fixes to handling external attachments
 - dsync: More fixes to avoid hanging with remote syncs
diff --git a/sources b/sources
index 652e33e..9edd824 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 689e1a8863d4fb2fd252e1a6121dd181  dovecot-2.0.12.tar.gz
-23b9be534c62257a0d049b1370f11a99  dovecot-2.0-pigeonhole-0.2.2.tar.gz
+336cbb2073b48119d968fad7de89817a  dovecot-2.0-pigeonhole-0.2.3.tar.gz