diff --git a/sys-fs/bees/bees-0.6.5.ebuild b/sys-fs/bees/bees-0.6.5-r1.ebuild
similarity index 94%
rename from sys-fs/bees/bees-0.6.5.ebuild
rename to sys-fs/bees/bees-0.6.5-r1.ebuild
index a52e8e18f6c97..ee339e86c5d36 100644
--- a/sys-fs/bees/bees-0.6.5.ebuild
+++ b/sys-fs/bees/bees-0.6.5-r1.ebuild
@@ -77,6 +77,7 @@ src_prepare() {
 src_configure() {
 	tc-export CC CXX
 	cat >localconf <<-EOF || die
+		ETC_PREFIX="${EPREFIX}/etc"
 		LIBEXEC_PREFIX="${EPREFIX}/usr/libexec"
 		PREFIX="${EPREFIX}/usr"
 		LIBDIR="${EPREFIX}/$(get_libdir)"
@@ -92,3 +93,9 @@ src_configure() {
 		echo OPTIONAL_INSTALL_TARGETS=install_tools >>localconf || die
 	fi
 }
+
+src_compile() {
+	default
+	# localconf quotes leak in the systemd unit but are still needed for spaces
+	sed -i 's/"//g' scripts/beesd@.service || die
+}
diff --git a/sys-fs/bees/bees-9999.ebuild b/sys-fs/bees/bees-9999.ebuild
index 7777d0ea45fd5..7fffe63931c2a 100644
--- a/sys-fs/bees/bees-9999.ebuild
+++ b/sys-fs/bees/bees-9999.ebuild
@@ -74,9 +74,9 @@ src_prepare() {
 src_configure() {
 	tc-export CC CXX AR
 	cat >localconf <<-EOF || die
+		ETC_PREFIX="${EPREFIX}/etc"
 		LIBEXEC_PREFIX="${EPREFIX}/usr/libexec"
 		PREFIX="${EPREFIX}/usr"
-		LIBDIR="${EPREFIX}/$(get_libdir)"
 		SYSTEMD_SYSTEM_UNIT_DIR="$(systemd_get_systemunitdir)"
 		DEFAULT_MAKE_TARGET=all
 	EOF
@@ -87,3 +87,9 @@ src_configure() {
 		echo OPTIONAL_INSTALL_TARGETS=install_tools >>localconf || die
 	fi
 }
+
+src_compile() {
+	default
+	# localconf quotes leak in the systemd unit but are still needed for spaces
+	sed -i 's/"//g' scripts/beesd@.service || die
+}