diff --git a/srcpkgs/dovecot-plugin-pigeonhole/template b/srcpkgs/dovecot-plugin-pigeonhole/template
index 1a9c0bd2e10..bcb9eb78d19 100644
--- a/srcpkgs/dovecot-plugin-pigeonhole/template
+++ b/srcpkgs/dovecot-plugin-pigeonhole/template
@@ -2,20 +2,23 @@
 pkgname=dovecot-plugin-pigeonhole
 # make sure this matches the current dovecot
 _dovecot_ver=2.2.19
-version=0.4.8
-revision=3
+version=0.4.9
+revision=1
 wrksrc="dovecot-2.2-pigeonhole-${version}"
 build_style=gnu-configure
 configure_args="--prefix=/usr
-  --with-dovecot=/usr/lib/dovecot 
+  --with-dovecot=${XBPS_CROSS_BASE}/usr/lib/dovecot 
   --with-moduledir=/usr/lib/dovecot/modules
   --disable-static"
+# Hack around dovecot-config for cross building.
+make_build_args="LIBDOVECOT_INCLUDE=-I${XBPS_CROSS_BASE}/usr/include/dovecot
+ LIBS=-L${XBPS_CROSS_BASE}/usr/lib/dovecot"
 short_desc="Sieve implementation for Dovecot"
 maintainer="John Regan <john@jrjrtech.com>"
 license="LGPL-2.1"
 homepage="http://pigeonhole.dovecot.org"
 distfiles="${homepage}/releases/2.2/dovecot-2.2-pigeonhole-${version}.tar.gz"
-checksum=d73c1c5a11cdfdcb58304a1c1272cce6c8e1868e3f61d393b3b8a725f3bf665b
+checksum=82892f876d26008a076973dfddf1cffaf5a0451825fd44e06287e94b89078649
 
 depends="dovecot"
 makedepends="dovecot-devel libressl-devel"
diff --git a/srcpkgs/dovecot-plugin-pigeonhole/update b/srcpkgs/dovecot-plugin-pigeonhole/update
new file mode 100644
index 00000000000..79e86dab050
--- /dev/null
+++ b/srcpkgs/dovecot-plugin-pigeonhole/update
@@ -0,0 +1,2 @@
+site='http://pigeonhole.dovecot.org/download.html'
+pattern='pigeonhole-\K[\d.]+(?=\.tar\.gz)'