diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest
index b5e39b0..306e32b 100644
--- a/net-mail/dovecot/Manifest
+++ b/net-mail/dovecot/Manifest
@@ -3,5 +3,5 @@ AUX dovecot-2.2.34-glibc226.patch 1089 BLAKE2B ce04a939e2c59dab536ef469a0e105c35
 AUX dovecot.init-r4 1499 BLAKE2B 9c05fd7da0409b0944b0204bdcd683ab889190effc8cb7b072dcab140f52e2f39336a344deb74b63ef184152604412ca4c2b3d79c3d63341386e7952c54b0a26 SHA512 8fbc80bc0efa6b83685da19b6a5c2a2d2ca7e59be7f1f7352984fe30004175330e53f3db1c4c2471f1d7d5e088bef0b4dced97d29d32be8b50d000987b6eeb09
 DIST dovecot-2.2-pigeonhole-0.4.21.tar.gz 1774887 BLAKE2B ebf2601e7b087d655713f985b72442496e36543ec32881d3bc84d2c6b132f58082aee6c5fae3747f756b72a3c9a2e11f78350bc34c398214de13dfc83cffdef1 SHA512 4751f449ede1b05173c706b414ebf9f7f670ff78589ce6f0b687c32c9abe6dae8b3064ed1b20e893d9ec0147b0139ce479e1d74ebe94747c33f2d8ca177912de
 DIST dovecot-2.2.34.tar.gz 6181270 BLAKE2B dfdb1e6812574e79595202e830167400569adf61155aa5ddaae443e798c4a05ccec2acd2975e00e9e7ffc63ee1dcf7e4e2a9288b1e6e1e1427d1e89790a8fa13 SHA512 9f08a7116a08a08495aa0e7b4cb6b11a924ea61006970487946e338bc79bba7fd7619c345cbf278a74de285d548af04fc66eaaee508185b8b9d7335cf5612055
-EBUILD dovecot-2.2.34-r1.ebuild 8737 BLAKE2B 649560d842e71b7e3606f6a47166fee43d93ca9b3d922def2e68422bc6eae770e113442d3f3833d9d57876ea88ea94bc6292d824880027c2e9ef8546b5c39809 SHA512 169dd55188deac94ade507f042c29bb3310e8b8561241a216a48f9c8e6f5227bcd852e56edb26289593a23ac3db5d308f6d8e9eee1ff0ed15cd26fd2f8dc78a0
+EBUILD dovecot-2.2.34-r1.ebuild 8744 BLAKE2B 987e971e567e9cef5a13e029ba4c9c738f02a869a340af224914e21a6fe540c490cee83fb7704c33e5adcfe4ce0ad36a8ed02f6c3cc0c020e18a900585a7e7c3 SHA512 1325e3cb6b9b3fa46edf2539c24469a608a808fd9eddc43e1481e397f40e1d092aed7c161a427f94fcbbf5b24152f0be5125d5770bf26eef53eb9154900d1425
 MISC metadata.xml 1374 BLAKE2B 629969318c5bcbdf0521d2293c6ead5e735ba5a113db3166e4df82103a3a84cbc62f3a2843082c9d5bdb635f25353ac7d3a4fcdf80d45e07b11b98754e744506 SHA512 16bdf15120dd8c957cd6e4957910acf21440dd0b8774cac9d9c5a48635cd46c7093850974b592ebbcd49085607fff2051691a42112f4ab9df44c51b9fea6d180
diff --git a/net-mail/dovecot/dovecot-2.2.34-r1.ebuild b/net-mail/dovecot/dovecot-2.2.34-r1.ebuild
index fd92de3..9454131 100644
--- a/net-mail/dovecot/dovecot-2.2.34-r1.ebuild
+++ b/net-mail/dovecot/dovecot-2.2.34-r1.ebuild
@@ -84,7 +84,6 @@ src_prepare() {
 	default
 	eapply -p0 "${FILESDIR}/${PN}-10-ssl.patch"
 	eapply -p0 "${FILESDIR}/${PN}-${PV}-glibc226.patch"
-	eapply_user
 	eautoreconf
 }
 
@@ -97,8 +96,8 @@ src_configure() {
 
 	# turn valgrind tests off. Bug #340791
 	VALGRIND=no econf \
-		--localstatedir="${EPREFIX}/var" \
-		--runstatedir="${EPREFIX}/run" \
+		--with-statedir="${EPREFIX}/var/lib/dovecot" \
+		--with-rundir="${EPREFIX}/run/dovecot" \
 		--with-moduledir="${EPREFIX}/usr/$(get_libdir)/dovecot" \
 		--without-stemmer \
 		--disable-rpath \