diff --git a/meta-digi-dey/recipes-connectivity/networkmanager/networkmanager_1.0.12.bbappend b/meta-digi-dey/recipes-connectivity/networkmanager/networkmanager_1.0.12.bbappend
index 2572506a6..0ce3aa24c 100644
--- a/meta-digi-dey/recipes-connectivity/networkmanager/networkmanager_1.0.12.bbappend
+++ b/meta-digi-dey/recipes-connectivity/networkmanager/networkmanager_1.0.12.bbappend
@@ -14,6 +14,11 @@ SRC_URI += " \
     file://nm.wlan0.static \
 "
 
+# 'polkit' and 'consolekit' require 'x11' distro feature, so disable them for non-X11 distros
+DEPENDS_remove = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', 'polkit', d)}"
+PACKAGECONFIG_remove = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', 'consolekit', d)}"
+EXTRA_OECONF += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', '--enable-polkit=disabled', d)}"
+
 PACKAGECONFIG_remove = "dnsmasq netconfig"
 PACKAGECONFIG_append = " concheck modemmanager ppp"