diff --git a/src/Makefile.am b/src/Makefile.am
index 85c1e44642e9e5c62ea96994d3adf1b93093f2d3..8675dd16f9372ff64ec56a529eedb8f6240bfd96 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,6 +2,7 @@
 
 sieve_subdirs = \
 	lib-sieve \
+	lib-managesieve \
 	plugins \
 	lib-sieve-tool \
 	sieve-tools \
@@ -9,7 +10,6 @@ sieve_subdirs = \
 
 if BUILD_MANAGESIEVE
 managesieve_subdirs = \
-	lib-managesieve \
 	managesieve \
 	managesieve-login
 else
diff --git a/src/lib-managesieve/Makefile.am b/src/lib-managesieve/Makefile.am
index 54558ea9bad9c50cf0f0819190d6de35457c9634..d41a3b0709ff46e037fe502b9690fbbb109ba269 100644
--- a/src/lib-managesieve/Makefile.am
+++ b/src/lib-managesieve/Makefile.am
@@ -1,22 +1,25 @@
-noinst_LTLIBRARIES = libmanagesieve.la
+dovecot_pkglib_LTLIBRARIES = libdovecot-managesieve.la
 
 AM_CPPFLAGS = \
 	$(LIBDOVECOT_INCLUDE) \
 	-I$(top_srcdir)
 
-libmanagesieve_la_SOURCES = \
+libdovecot_managesieve_la_SOURCES = \
 	managesieve-arg.c \
 	managesieve-quote.c \
 	managesieve-parser.c \
 	managesieve-url.c
 
-noinst_HEADERS = \
+headers = \
 	managesieve-protocol.h \
 	managesieve-arg.h \
 	managesieve-quote.h \
 	managesieve-parser.h \
 	managesieve-url.h
 
+pkginc_libdir=$(dovecot_pkgincludedir)/sieve
+pkginc_lib_HEADERS = $(headers)
+
 test_programs = \
 	test-managesieve-url
 
@@ -25,11 +28,11 @@ test_nocheck_programs =
 noinst_PROGRAMS = $(test_programs) $(test_nocheck_programs)
 
 test_libs = \
-	$(noinst_LTLIBRARIES) \
+	$(dovecot_pkglib_LTLIBRARIES) \
 	$(LIBDOVECOT_STORAGE) \
 	$(LIBDOVECOT)
 test_deps = \
-	$(noinst_LTLIBRARIES) \
+	$(dovecot_pkglib_LTLIBRARIES) \
 	$(LIBDOVECOT_STORAGE_DEPS) \
 	$(LIBDOVECOT_DEPS)
 
diff --git a/src/managesieve-login/Makefile.am b/src/managesieve-login/Makefile.am
index 3bfbc75a2f728a251f8a3ddc78947f83dd570283..19ac1a5a39a6f8b7500569e960673b08524b9d5b 100644
--- a/src/managesieve-login/Makefile.am
+++ b/src/managesieve-login/Makefile.am
@@ -22,7 +22,7 @@ libmanagesieve_login_settings_la_CFLAGS = \
 	$(AM_CFLAGS) $(LIBDOVECOT_CONFIG_INCLUDE) -DPKG_LIBEXECDIR=\""$(dovecot_pkglibexecdir)"\"
 
 libs = \
-	$(top_builddir)/src/lib-managesieve/libmanagesieve.la
+	$(top_builddir)/src/lib-managesieve/libdovecot-managesieve.la
 
 managesieve_login_CPPFLAGS = $(AM_CPPFLAGS) $(BINARY_CFLAGS)
 managesieve_login_LDFLAGS = $(BINARY_LDFLAGS)
diff --git a/src/managesieve/Makefile.am b/src/managesieve/Makefile.am
index 17b5790369e7c007dde493093fc65bf670de3e7b..8a697dcc2bac0078c89635925cc0d31ede80a712 100644
--- a/src/managesieve/Makefile.am
+++ b/src/managesieve/Makefile.am
@@ -20,7 +20,7 @@ libmanagesieve_settings_la_SOURCES = \
 
 libs = \
 	managesieve-settings.lo \
-	$(top_builddir)/src/lib-managesieve/libmanagesieve.la \
+	$(top_builddir)/src/lib-managesieve/libdovecot-managesieve.la \
 	$(top_builddir)/src/lib-sieve/libdovecot-sieve.la
 
 managesieve_CPPFLAGS = $(AM_CPPFLAGS) $(BINARY_CFLAGS)