diff --git a/config/common.mk b/config/common.mk
index 8b03b94c..00d3ebf3 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -159,6 +159,9 @@ PRODUCT_PACKAGES += \
     CMFileManager \
     LockClock
 
+PRODUCT_PACKAGES += \
+    CellBroadcastReceiver
+
 # Extra tools in CM
 PRODUCT_PACKAGES += \
     openvpn \
diff --git a/overlay/common/frameworks/base/core/res/res/values/config.xml b/overlay/common/frameworks/base/core/res/res/values/config.xml
index 6748a41f..4600e222 100644
--- a/overlay/common/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/common/frameworks/base/core/res/res/values/config.xml
@@ -17,5 +17,7 @@
     <!-- Class name for default keyguard appwidget [DO NOT TRANSLATE] -->
     <string name="widget_default_class_name">com.cyanogenmod.lockclock.ClockWidgetProvider</string>
 
+    <bool name="config_cellBroadcastAppLinks">true</bool>
+
 </resources>