diff --git a/meta-oniro-core/conf/distro/include/oniro-packageconfig.inc b/meta-oniro-core/conf/distro/include/oniro-packageconfig.inc
index d499ba7397b3931f0b03e64014e1164a0a177aee..cb952aa4f99ad6d39c46b39ddba2f24d87827aa6 100644
--- a/meta-oniro-core/conf/distro/include/oniro-packageconfig.inc
+++ b/meta-oniro-core/conf/distro/include/oniro-packageconfig.inc
@@ -5,6 +5,11 @@
 # Define the configuration set as per our distro policy
 PACKAGECONFIG:pn-networkmanager = "nss systemd bluez5 wifi nmcli"
 
+# If the machine has a cellular modem it can set MACHINE_FEATURES+=modem to
+# enable build-in support in NetworkManager.
+PACKAGECONFIG:append:pn-networkmanager = "${@bb.utils.contains('MACHINE_FEATURES', \
+                                          'modem', ' modemmanager ', '', d)}"
+
 # We have no use for dlt-daemon as we use systemd for logging
 PACKAGECONFIG:remove:pn-mosquitto = "dlt"
 
diff --git a/meta-oniro-core/recipes-core/images/oniro-image-common.inc b/meta-oniro-core/recipes-core/images/oniro-image-common.inc
index 0ac0ab13f23416c5bedbcb94490dfde43bbea081..6ce454fb7cb8c7b237d3bc2cb9e0e894588fb791 100644
--- a/meta-oniro-core/recipes-core/images/oniro-image-common.inc
+++ b/meta-oniro-core/recipes-core/images/oniro-image-common.inc
@@ -20,3 +20,10 @@ IMAGE_INSTALL:append = "\
 			"
 
 IMAGE_INSTALL:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'optee-client', '', d)} "
+
+# If the machine has a cellular modem it can set MACHINE_FEATURES+=modem to
+# add the needed packages into the image. In the special case of an USB cellular
+# modem adding MACHINE_FEATURES+="modem usbmodem" ensures to have the usb-modeswitch
+# package as well.
+IMAGE_INSTALL:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'modem', 'networkmanager-wwan modemmanager', '', d)} "
+IMAGE_INSTALL:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'usbmodem', 'usb-modeswitch', '', d)} "