diff --git a/configure.ac b/configure.ac
index d802991c999dea8f92a7b7c3d0609c729ebcf504..0d478385679573d56bb429e2a4911b88df4b675d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,6 @@
 AC_INIT([Pigeonhole], [0.4.8], [dovecot@dovecot.org], [dovecot-2.2-pigeonhole])
+AC_DEFINE_UNQUOTED([PIGEONHOLE_ABI_VERSION], "0.4.ABIv1($PACKAGE_VERSION)", [Pigeonhole ABI version])
+
 AC_CONFIG_AUX_DIR([.])
 AC_CONFIG_SRCDIR([src])
 AC_CONFIG_MACRO_DIR([m4])
diff --git a/pigeonhole-config.h.in b/pigeonhole-config.h.in
index e28e583eada34189ffc55e082e65f90b7e9346f6..60b0ff9fb612d6d20cd01d9d3682a1f28a5b436c 100644
--- a/pigeonhole-config.h.in
+++ b/pigeonhole-config.h.in
@@ -5,6 +5,9 @@
 /* Define to the version of Pigeonhole for Dovecot. */
 #undef PIGEONHOLE_VERSION
 
+/* Pigeonhole ABI version */
+#undef PIGEONHOLE_ABI_VERSION
+
 /* Define to build unfinished features/extensions. */
 #undef HAVE_SIEVE_UNFINISHED
 
diff --git a/src/lib-sieve/sieve-plugins.c b/src/lib-sieve/sieve-plugins.c
index 93656abd4e94d74f58f7f0c9468afc42628d2c3f..b7f98a4b461d11dbd4c97bb5d14f58aae8665c9a 100644
--- a/src/lib-sieve/sieve-plugins.c
+++ b/src/lib-sieve/sieve-plugins.c
@@ -77,7 +77,7 @@ void sieve_plugins_load
 		path = MODULEDIR"/sieve";
 
 	memset(&mod_set, 0, sizeof(mod_set));
-	mod_set.abi_version = PIGEONHOLE_VERSION;
+	mod_set.abi_version = PIGEONHOLE_ABI_VERSION;
 	mod_set.require_init_funcs = TRUE;
 	mod_set.debug = FALSE;
 
diff --git a/src/lib-sieve/storage/ldap/sieve-ldap-storage.c b/src/lib-sieve/storage/ldap/sieve-ldap-storage.c
index 873574c55010279aa39ce4485d379d151cf8445d..81e7e7162daa34b103ae633231865f2e6a4b222b 100644
--- a/src/lib-sieve/storage/ldap/sieve-ldap-storage.c
+++ b/src/lib-sieve/storage/ldap/sieve-ldap-storage.c
@@ -184,6 +184,8 @@ const struct sieve_storage sieve_ldap_storage_plugin = {
 #ifndef SIEVE_BUILTIN_LDAP
 /* Building a plugin */
 
+const char *sieve_storage_ldap_plugin_version = PIGEONHOLE_ABI_VERSION;
+
 void sieve_storage_ldap_plugin_load
 (struct sieve_instance *svinst, void **context);
 void sieve_storage_ldap_plugin_unload
diff --git a/src/plugins/sieve-extprograms/sieve-extprograms-plugin.c b/src/plugins/sieve-extprograms/sieve-extprograms-plugin.c
index acd9ac6676b69627fc74136e03b2b1f1518b91cc..c629336d7b3190876421b06a590211906cb9c602 100644
--- a/src/plugins/sieve-extprograms/sieve-extprograms-plugin.c
+++ b/src/plugins/sieve-extprograms/sieve-extprograms-plugin.c
@@ -18,6 +18,8 @@ struct _plugin_context {
 	const struct sieve_extension *ext_execute;		
 };
 
+const char *sieve_extprograms_plugin_version = PIGEONHOLE_ABI_VERSION;
+
 void sieve_extprograms_plugin_load
 (struct sieve_instance *svinst, void **context)
 {