diff --git a/configure.ac b/configure.ac
index 8174e70599a3af0328118e4c35b00bc25c0f4327..7c376c0dbed711e0b8643b79525bffa36802778f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -211,6 +211,7 @@ src/plugins/Makefile
 src/plugins/doveadm-sieve/Makefile
 src/plugins/lda-sieve/Makefile
 src/plugins/sieve-extprograms/Makefile
+src/plugins/settings/Makefile
 src/sieve-tools/Makefile
 src/managesieve/Makefile
 src/managesieve-login/Makefile
diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am
index b1f4d858b012902852d7b1b0d7f781ef270f0f87..a124d59ed807061a229c0854bfd071a13e7e7f7b 100644
--- a/src/plugins/Makefile.am
+++ b/src/plugins/Makefile.am
@@ -1,4 +1,5 @@
 SUBDIRS = \
 	doveadm-sieve \
 	lda-sieve \
-	sieve-extprograms
+	sieve-extprograms \
+	settings
diff --git a/src/plugins/settings/Makefile.am b/src/plugins/settings/Makefile.am
new file mode 100644
index 0000000000000000000000000000000000000000..49537e1f06e36597fe2cb5c06f707d76b7b556a9
--- /dev/null
+++ b/src/plugins/settings/Makefile.am
@@ -0,0 +1,12 @@
+settingsdir = $(dovecot_moduledir)/settings
+
+AM_CPPFLAGS = \
+	$(LIBDOVECOT_INCLUDE)
+
+libpigeonhole_settings_la_LDFLAGS = -module -avoid-version
+
+settings_LTLIBRARIES = \
+	libpigeonhole_settings.la
+
+libpigeonhole_settings_la_SOURCES = \
+	pigeonhole-settings.c
diff --git a/src/plugins/settings/pigeonhole-settings.c b/src/plugins/settings/pigeonhole-settings.c
new file mode 100644
index 0000000000000000000000000000000000000000..c7ffbd5fd925c34c08b2b1ff688ce51b94eb3d32
--- /dev/null
+++ b/src/plugins/settings/pigeonhole-settings.c
@@ -0,0 +1,12 @@
+/* Copyright (c) 2012-2013 Dovecot Oy, see the included COPYING file */
+
+#include "lib.h"
+#include "pigeonhole-config.h"
+#include "pigeonhole-version.h"
+
+/* This is currently just a dummy plugin that adds a Pigeonhole
+ * version banner the doveconf output.
+ */
+
+const char *pigeonhole_settings_version = DOVECOT_ABI_VERSION;
+const char *pigeonhole_settings_doveconf_banner = "Pigeonhole version "PIGEONHOLE_VERSION_FULL;