diff --git a/.gitignore b/.gitignore
index ae29847..3975cba 100644
--- a/.gitignore
+++ b/.gitignore
@@ -89,3 +89,4 @@ pigeonhole-snap0592366457df.tar.bz2
 /dovecot-2.2.17.tar.gz
 /dovecot-2.2.18.tar.gz
 /dovecot-2.2-pigeonhole-0.4.7.tar.gz
+/dovecot-2.2-pigeonhole-0.4.8.tar.gz
diff --git a/dovecot.spec b/dovecot.spec
index 46f6711..9fd9544 100644
--- a/dovecot.spec
+++ b/dovecot.spec
@@ -5,7 +5,7 @@ Name: dovecot
 Epoch: 1
 Version: 2.2.18
 %global prever %{nil}
-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
@@ -14,7 +14,7 @@ URL: http://www.dovecot.org/
 Source: http://www.dovecot.org/releases/2.2/%{name}-%{version}%{?prever}.tar.gz
 Source1: dovecot.init
 Source2: dovecot.pam
-%global pigeonholever 0.4.7
+%global pigeonholever 0.4.8
 Source8: http://www.rename-it.nl/dovecot/2.2/dovecot-2.2-pigeonhole-%{pigeonholever}.tar.gz
 #wget http://hg.rename-it.nl/dovecot-2.2-pigeonhole/archive/%{pigeonholever}.tar.bz2 -O dovecot-2.2-pigeonhole-%{pigeonholever}.tar.bz2
 #Source8: dovecot-2.2-pigeonhole-%{pigeonholever}.tar.bz2
@@ -495,6 +495,15 @@ make check
 %{_libdir}/%{name}/dict/libdriver_pgsql.so
 
 %changelog
+* Mon May 18 2015 Michal Hlavinka <mhlavink@redhat.com> - 1:2.2.18-2
+- update pigeonhole to 0.4.8
+- Fixed problem in address test: erroneously decoded mime-encoded words in
+  address headers.
+- extprograms plugin: Fixed failure occurring when connecting to script
+  service without the need to read back the output from the external program.
+- Fixed bug in script storage path normalization occurring with relative
+  symbolic links below root.
+
 * Fri May 15 2015 Michal Hlavinka <mhlavink@redhat.com> - 1:2.2.18-1
 - director: Login UNIX sockets were normally detected as doveadm or
   director ring sockets, causing it to break in existing installations.
diff --git a/sources b/sources
index 0cd8e63..25e8b38 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 1e42eb3b69544c447ad882d7858f3630  dovecot-2.2.18.tar.gz
-a98b6e3b7f73959b17ba661ce6bb8886  dovecot-2.2-pigeonhole-0.4.7.tar.gz
+3568ede2c3607e239ad9801034ba2a5d  dovecot-2.2-pigeonhole-0.4.8.tar.gz