diff --git a/README b/README
index 35a0766f779050562481f28474eda194c833fb06..ad2ab02b0b0535282853e44348a38e9de7799b85 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-Pigeonhole for Dovecot v2.2
+Pigeonhole for Dovecot v2.4
 
 Introduction
 ============
diff --git a/configure.ac b/configure.ac
index 8f7a1123dfc0f5ec2b5a7568de3c1f593a413f9f..53b3359f6373f2c5f51f050f9e68fc9898986449 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@ AC_PREREQ([2.59])
 
 # Be sure to update ABI version also if anything changes that might require
 # recompiling plugins. Most importantly that means if any structs are changed.
-AC_INIT([Pigeonhole], [0.6.devel], [dovecot@dovecot.org], [dovecot-2.2-pigeonhole])
+AC_INIT([Pigeonhole], [0.6.devel], [dovecot@dovecot.org], [dovecot-2.4-pigeonhole])
 AC_DEFINE_UNQUOTED([PIGEONHOLE_ABI_VERSION], "0.6.ABIv0($PACKAGE_VERSION)", [Pigeonhole ABI version])
 
 AC_CONFIG_AUX_DIR([.])
diff --git a/doc/man/doveadm-sieve.1.in b/doc/man/doveadm-sieve.1.in
index 421167dffa6eb6837f6fef3d722f54b29646ecf8..aed9337a0014301acc905e8df2e7af5a34f92264 100644
--- a/doc/man/doveadm-sieve.1.in
+++ b/doc/man/doveadm-sieve.1.in
@@ -1,5 +1,5 @@
 .\" Copyright (c) 2010-2018 Pigeonhole authors, see the included COPYING file
-.TH DOVEADM\-SIEVE 1 "2016-02-29" "Pigeonhole v0.4 for Dovecot v2.2" "Pigeonhole"
+.TH DOVEADM\-SIEVE 1 "2016-02-29" "Pigeonhole for Dovecot v2.4" "Pigeonhole"
 .SH NAME
 doveadm\-sieve \- Commands related to handling Sieve scripts
 .\"------------------------------------------------------------------------
diff --git a/doc/man/pigeonhole.7.in b/doc/man/pigeonhole.7.in
index f866bc58cb50cfefb758d72f6736b8b9e3e7c608..18b081d02b28a91bd36198af505265ee96377b4a 100644
--- a/doc/man/pigeonhole.7.in
+++ b/doc/man/pigeonhole.7.in
@@ -1,5 +1,5 @@
 .\" Copyright (c) 2010-2018 Pigeonhole authors, see the included COPYING file
-.TH "PIGEONHOLE" 7 "2015-02-21" "Pigeonhole v0.4 for Dovecot v2.2" "Pigeonhole"
+.TH "PIGEONHOLE" 7 "2015-02-21" "Pigeonhole for Dovecot v2.4" "Pigeonhole"
 .\"------------------------------------------------------------------------
 .SH NAME
 pigeonhole \- Overview of the Pigeonhole project\(aqs Sieve support for the
diff --git a/doc/man/sieve-dump.1.in b/doc/man/sieve-dump.1.in
index ca73ef2aa3792c8a32f6996a483b1eee6757613c..7a79c6824474a87fbbb02aff742ee454e90380cb 100644
--- a/doc/man/sieve-dump.1.in
+++ b/doc/man/sieve-dump.1.in
@@ -1,5 +1,5 @@
 .\" Copyright (c) 2010-2018 Pigeonhole authors, see the included COPYING file
-.TH "SIEVE\-DUMP" 1 "2016-04-05" "Pigeonhole for Dovecot v2.2" "Pigeonhole"
+.TH "SIEVE\-DUMP" 1 "2016-04-05" "Pigeonhole for Dovecot v2.4" "Pigeonhole"
 .\"------------------------------------------------------------------------
 .SH NAME
 sieve\-dump \- Pigeonhole\(aqs Sieve script binary dump tool
diff --git a/doc/man/sieve-filter.1.in b/doc/man/sieve-filter.1.in
index e373235971f9acb88ab1882f212154042f9f12ec..1ce804b61c967b3f4cae04aa5ef7a4d9b73107de 100644
--- a/doc/man/sieve-filter.1.in
+++ b/doc/man/sieve-filter.1.in
@@ -1,5 +1,5 @@
 .\" Copyright (c) 2010-2018 Pigeonhole authors, see the included COPYING file
-.TH "SIEVE\-FILTER" 1 "2016-04-05" "Pigeonhole for Dovecot v2.2" "Pigeonhole"
+.TH "SIEVE\-FILTER" 1 "2016-04-05" "Pigeonhole for Dovecot v2.4" "Pigeonhole"
 .SH NAME
 sieve\-filter \- Pigeonhole\(aqs Sieve mailbox filter tool
 
diff --git a/doc/man/sieve-test.1.in b/doc/man/sieve-test.1.in
index 457e175b3f5aeef1fe3296740dd5e57b351516f3..65e5230dd08c31985c510da1ed8bfdb047f81446 100644
--- a/doc/man/sieve-test.1.in
+++ b/doc/man/sieve-test.1.in
@@ -1,5 +1,5 @@
 .\" Copyright (c) 2010-2018 Pigeonhole authors, see the included COPYING file
-.TH "SIEVE\-TEST" 1 "2016-04-05" "Pigeonhole for Dovecot v2.2" "Pigeonhole"
+.TH "SIEVE\-TEST" 1 "2016-04-05" "Pigeonhole for Dovecot v2.4" "Pigeonhole"
 .SH NAME
 sieve\-test \- Pigeonhole\(aqs Sieve script tester
 .\"------------------------------------------------------------------------
diff --git a/doc/man/sievec.1.in b/doc/man/sievec.1.in
index 3b3df33592feac08c2548870a91e17005829f9be..548bcca0cf4fda0c705570bebbff87feeea525f6 100644
--- a/doc/man/sievec.1.in
+++ b/doc/man/sievec.1.in
@@ -1,5 +1,5 @@
 .\" Copyright (c) 2010-2018 Pigeonhole authors, see the included COPYING file
-.TH "SIEVEC" 1 "2016-04-05" "Pigeonhole for Dovecot v2.2" "Pigeonhole"
+.TH "SIEVEC" 1 "2016-04-05" "Pigeonhole for Dovecot v2.4" "Pigeonhole"
 .\"------------------------------------------------------------------------
 .SH NAME
 sievec \- Pigeonhole\(aqs Sieve script compiler