diff --git a/meta/recipes-core/systemd/systemd-conf/logind.conf b/meta/recipes-core/systemd/systemd-conf/logind.conf
index bf7f6920fa..25f01f3fb6 100644
--- a/meta/recipes-core/systemd/systemd-conf/logind.conf
+++ b/meta/recipes-core/systemd/systemd-conf/logind.conf
@@ -1,2 +1,2 @@
 [Login]
-KillUserProcesses=yes
+KillUserProcesses=@KILL_USER_PROCESSES@
diff --git a/meta/recipes-core/systemd/systemd-conf_1.0.bb b/meta/recipes-core/systemd/systemd-conf_1.0.bb
index 60066cd60a..55bbeb69eb 100644
--- a/meta/recipes-core/systemd/systemd-conf_1.0.bb
+++ b/meta/recipes-core/systemd/systemd-conf_1.0.bb
@@ -10,8 +10,9 @@ REQUIRED_DISTRO_FEATURES += "usrmerge"
 
 PE = "1"
 
-PACKAGECONFIG ??= "dhcp-ethernet"
+PACKAGECONFIG ??= "dhcp-ethernet kill-user-processes"
 PACKAGECONFIG[dhcp-ethernet] = ""
+PACKAGECONFIG[kill-user-processes] = ""
 
 SRC_URI = "\
     file://journald.conf \
@@ -28,6 +29,9 @@ do_install() {
 	install -D -m0644 ${S}/logind.conf ${D}${systemd_unitdir}/logind.conf.d/00-${PN}.conf
 	install -D -m0644 ${S}/system.conf ${D}${systemd_unitdir}/system.conf.d/00-${PN}.conf
 
+        KILL_USER_PROCESSES="${@bb.utils.contains('PACKAGECONFIG', 'kill-user-processes', 'yes', 'no', d)}"
+        sed -i "s/@KILL_USER_PROCESSES@/${KILL_USER_PROCESSES}/" ${D}${systemd_unitdir}/logind.conf.d/00-${PN}.conf
+
         if ${@bb.utils.contains('PACKAGECONFIG', 'dhcp-ethernet', 'true', 'false', d)}; then
 		install -D -m0644 ${S}/wired.network ${D}${systemd_unitdir}/network/80-wired.network
         fi