diff --git a/configure.ac b/configure.ac
index 028c69cadaa51117012976fdeed10cff5ddbc5ec..5b4879bdab156acc61e1a1927e4c51dd29e50e38 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5,12 +5,10 @@ m4_define([pigeonhole_VERSION],
 m4_define([pigeonhole_ABI_VERSION],
     m4_esyscmd_s([build-aux/git-abi-version-gen]))))
 
-m4_define([pigeonhole_TAR_VERSION],
-    m4_esyscmd_s([build-aux/git-tarname-version-gen]))))
 
 # 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], [m4_defn([pigeonhole_VERSION])], [dovecot@dovecot.org], [m4_defn([pigeonhole_TAR_VERSION])])
+AC_INIT([dovecot-pigeonhole], [m4_defn([pigeonhole_VERSION])], [dovecot@dovecot.org])
 AC_DEFINE_UNQUOTED([PIGEONHOLE_ABI_VERSION], "0.6.ABIv0($PACKAGE_VERSION)", [Pigeonhole ABI version])
 
 AC_CONFIG_SRCDIR([src])