--- a/polkit-0.113-r200.ebuild	2016-09-01 09:36:56.000000000 +0200
+++ b/polkit-0.113-r202.ebuild	2016-10-28 15:38:35.598131349 +0200
@@ -44,7 +44,10 @@
 		kde-plasma/polkit-kde-agent
 		sys-auth/polkit-kde-agent
 		) )
-	!systemd? ( sys-auth/consolekit[policykit] )
+	!systemd? ( || (
+		sys-auth/elogind
+		sys-auth/consolekit[policykit]
+		) )
 "
 
 QA_MULTILIB_PATHS="
@@ -74,6 +77,8 @@
 		sed -i -e "s/libsystemd-login/libelogind/" -e "s|test ! -d /sys/fs/cgroup/systemd/|false|" configure || die
 		sed -i -e "s/systemd/elogind/" src/polkit/polkitunixsession-systemd.c src/polkitbackend/polkitbackendsessionmonitor-systemd.c src/polkitbackend/polkitbackendjsauthority.c || die
 	fi
+
+	default
 }
 
 src_configure() {
@@ -90,7 +95,7 @@
 		--disable-examples \
 		$(use_enable nls) \
 		--with-mozjs=mozjs185 \
-		"$(systemd_with_unitdir)" \
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
 		--with-authfw=$(usex pam pam shadow) \
 		$(use pam && echo --with-pam-module-dir="$(getpam_mod_dir)") \
 		$(use_enable test) \