diff --git a/config/common.mk b/config/common.mk
index 6180f56..14c3b9e 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -252,6 +252,13 @@
     media.sf.omx-plugin=libffmpeg_omx.so \
     media.sf.extractor-plugin=libffmpeg_extractor.so
 
+# Telephony
+PRODUCT_PACKAGES += \
+    telephony-ext
+
+PRODUCT_BOOT_JARS += \
+    telephony-ext
+
 # These packages are excluded from user builds
 ifneq ($(TARGET_BUILD_VARIANT),user)
 PRODUCT_PACKAGES += \
diff --git a/config/telephony.mk b/config/telephony.mk
index 29d3e97..2503125 100644
--- a/config/telephony.mk
+++ b/config/telephony.mk
@@ -6,11 +6,7 @@
 PRODUCT_PACKAGES += \
     messaging \
     Stk \
-    CellBroadcastReceiver \
-    telephony-ext
-
-PRODUCT_BOOT_JARS += \
-    telephony-ext
+    CellBroadcastReceiver
 
 # Default ringtone
 PRODUCT_PROPERTY_OVERRIDES += \