diff --git a/config/common.mk b/config/common.mk
index c3c13a8..8b764be 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -151,6 +151,13 @@
     CMHome \
     CyanogenSetupWizard
 
+# CM Bug Reporting
+PRODUCT_PACKAGES += \
+    CMBugReport
+
+PRODUCT_PROPERTY_OVERRIDES += \
+    ro.error.receiver.system.apps=org.cyanogenmod.bugreport
+
 # CM Hardware Abstraction Framework
 PRODUCT_PACKAGES += \
     org.cyanogenmod.hardware \
diff --git a/overlay/common/frameworks/base/packages/SettingsProvider/res/values/defaults.xml b/overlay/common/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
index d0802f7..eb8a870 100644
--- a/overlay/common/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
+++ b/overlay/common/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
@@ -27,4 +27,7 @@
 
     <!-- Default for Settings.Secure.STATS_COLLECTION. -->
     <bool name="def_cm_stats_collection">true</bool>
+
+    <!-- Default for Settings.Global.SEND_ACTION_APP_ERROR -->
+    <integer name="def_send_action_app_error">1</integer>
 </resources>