diff --git a/configure.in b/configure.in
index 6fcb8aace1fad19c620f1a4b2ad08d430eef411e..c797d9cc630231a05e8b233b083e38a1d8baab53 100644
--- a/configure.in
+++ b/configure.in
@@ -107,6 +107,19 @@ AC_SUBST(MODULE_LIBS)
 AC_SUBST(dovecot_incdir)
 AC_SUBST(moduledir)
 
+if test "$docdir" = ""; then
+  dnl docdir supported only by autoconf v2.59c and later
+  docdir='${datadir}/doc/dovecot'
+fi
+AC_SUBST(docdir)
+
+dovecot_pkglibexecdir=$(libexecdir)/dovecot
+dovecot_pkglibdir=$(libdir)/dovecot
+dovecot_pkgincludedir=$(includedir)/dovecot
+AC_SUBST(dovecot_pkglibexecdir)
+AC_SUBST(dovecot_pkglibdir)
+AC_SUBST(dovecot_pkgincludedir)
+
 AC_CONFIG_FILES([
 Makefile
 doc/Makefile
diff --git a/src/lib-sieve/Makefile.am b/src/lib-sieve/Makefile.am
index cb5f71bcacfcdd689104be71e5d9b1b000762ffd..e293c39cfff91503ff3125d3bcd29b913c9c1b38 100644
--- a/src/lib-sieve/Makefile.am
+++ b/src/lib-sieve/Makefile.am
@@ -1,6 +1,6 @@
 SUBDIRS = plugins
 
-pkglib_LTLIBRARIES = libdovecot-sieve.la
+dovecot_pkglib_LTLIBRARIES = libdovecot-sieve.la
 
 AM_CPPFLAGS = \
 	-I$(dovecot_incdir) \
@@ -139,7 +139,7 @@ headers = \
 	sieve.h
 
 if INSTALL_HEADERS
-	pkginc_libdir=$(pkgincludedir)/sieve
+	pkginc_libdir=$(dovecot_pkgincludedir)/sieve
 	pkginc_lib_HEADERS = $(headers)
 else
 	noinst_HEADERS = $(headers)
diff --git a/src/lib-sieve/plugins/enotify/Makefile.am b/src/lib-sieve/plugins/enotify/Makefile.am
index b9f600808e20ac69879290f1fea94f1a792e8045..36cdf00222def3ce8d7547641970d91a578eebc9 100644
--- a/src/lib-sieve/plugins/enotify/Makefile.am
+++ b/src/lib-sieve/plugins/enotify/Makefile.am
@@ -37,7 +37,7 @@ headers = \
 	ext-enotify-common.h
 
 if INSTALL_HEADERS
-  pkginc_libdir=$(pkgincludedir)/sieve
+  pkginc_libdir=$(dovecot_pkgincludedir)/sieve
   pkginc_lib_HEADERS = $(public_headers)
   noinst_HEADERS = $(headers)
 else
diff --git a/src/lib-sieve/plugins/environment/Makefile.am b/src/lib-sieve/plugins/environment/Makefile.am
index 8de6768008952f8082d182784646cc467884b0c2..e761fd12dad7b7c4f4812ad4c67991cab0fb574b 100644
--- a/src/lib-sieve/plugins/environment/Makefile.am
+++ b/src/lib-sieve/plugins/environment/Makefile.am
@@ -22,7 +22,7 @@ headers = \
 	ext-environment-common.h
 
 if INSTALL_HEADERS
-  pkginc_libdir=$(pkgincludedir)/sieve
+  pkginc_libdir=$(dovecot_pkgincludedir)/sieve
   pkginc_lib_HEADERS = $(public_headers)
   noinst_HEADERS = $(headers)
 else
diff --git a/src/lib-sieve/plugins/variables/Makefile.am b/src/lib-sieve/plugins/variables/Makefile.am
index 410fe97011c28ad101f02c3164e74d28b6d74425..7e44e94cd0cb2dd4a07ee2ab073caf0ddd959bbe 100644
--- a/src/lib-sieve/plugins/variables/Makefile.am
+++ b/src/lib-sieve/plugins/variables/Makefile.am
@@ -37,7 +37,7 @@ headers = \
 	ext-variables-dump.h
 
 if INSTALL_HEADERS
-  pkginc_libdir=$(pkgincludedir)/sieve
+  pkginc_libdir=$(dovecot_pkgincludedir)/sieve
   pkginc_lib_HEADERS = $(public_headers)
   noinst_HEADERS = $(headers)
 else
diff --git a/src/sieve-tools/Makefile.am b/src/sieve-tools/Makefile.am
index dc9d393b10ac44467a64c2955cf82817cafabef0..ec35660dbc3d122f1974369e6d0482be4001d143 100644
--- a/src/sieve-tools/Makefile.am
+++ b/src/sieve-tools/Makefile.am
@@ -1,5 +1,3 @@
-pkglibexecdir = $(libexecdir)/dovecot
-
 SUBDIRS = debug
 
 bin_PROGRAMS = sievec sieved sieve-test