diff --git a/Makefile.am b/Makefile.am
index 794922fa6cc360ddbb3690a95c8c4ba4021be56d..91d94db078fed136756bf91276818e858b700c24 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -33,7 +33,7 @@ ChangeLog: .hg/dirstate
 	hg log --style=changelog > ChangeLog
 endif
 
-dist_aclocal_DATA = pigeonhole.m4
+dist_aclocal_DATA = dovecot-pigeonhole.m4
 
 pigeonhole-version.h: noop
 	$(SHELL) $(top_srcdir)/update-version.sh $(top_srcdir) $(top_builddir)
diff --git a/pigeonhole.m4 b/dovecot-pigeonhole.m4
similarity index 100%
rename from pigeonhole.m4
rename to dovecot-pigeonhole.m4