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 \