diff --git a/config/common.mk b/config/common.mk
index ae21644..752fb96 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -156,6 +156,13 @@
     CMAccount \
     CMHome
 
+# 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 5036580..f9c841f 100644
--- a/overlay/common/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
+++ b/overlay/common/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
@@ -25,4 +25,6 @@
     <integer name="def_notif_count">1</integer>
     <!-- Right QS pulldown -->
     <integer name="def_qs_quick_pulldown">1</integer>
+    <!-- Default for Settings.Global.SEND_ACTION_APP_ERROR -->
+    <integer name="def_send_action_app_error">1</integer>
 </resources>