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..50401f7f355f851a4fa29ef097b0f44b68debfda 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,15 @@ 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
+# enable build-in support in NetworkManager as well as ading needed packages to
+# the image.
+# In the special case of a USB cellular modem there is often the addtionial need
+# for the usb-modeswitch package to switch between mass storage and modem.
+
+PACKAGECONFIG:append:pn-networkmanager = " \
+        ${@bb.utils.contains('MACHINE_FEATURES', 'modem', ' modemmanager ', '', d)} \
+"
+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)} "