diff --git a/conf/distro/include/sysmocom-defaults.conf b/conf/distro/include/sysmocom-defaults.conf
index 90f50ca..3714010 100644
--- a/conf/distro/include/sysmocom-defaults.conf
+++ b/conf/distro/include/sysmocom-defaults.conf
@@ -20,3 +20,18 @@ INHERIT += " sysmocom-archive-patched-source"
 
 # We use opkg and not rpm/smart
 PACKAGE_CLASSES ?= "package_ipk"
+
+
+# When using uclibc/musl.. avoid pulling in gettext. We do
+# not need i18n in our tools right now.
+USE_NLS = "no"
+
+
+# We don't need x11, nfc, selinux, pam in our builds
+DISTRO_FEATURES_remove = "x11 nfc selinux pam"
+
+# Get rid off XZ for systemd
+PACKAGECONFIG_pn-systemd = "ldconfig"
+
+# From fido on.. build curl with libssl to avoid gnutls
+PACKAGECONFIG_pn-curl="ipv6 ssl zlib"