diff --git a/config/common.mk b/config/common.mk
index 64e0d3c..7f6f64b 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -152,9 +152,6 @@
     org.cyanogenmod.hardware \
     org.cyanogenmod.hardware.xml
 
-PRODUCT_PACKAGES += \
-    CellBroadcastReceiver
-
 # Extra tools in CM
 PRODUCT_PACKAGES += \
     openvpn \
diff --git a/config/telephony.mk b/config/telephony.mk
index cd21f2d..eff747d 100644
--- a/config/telephony.mk
+++ b/config/telephony.mk
@@ -10,4 +10,5 @@
 PRODUCT_PACKAGES += \
     Mms \
     Stk \
+    CellBroadcastReceiver \
     WhisperPush