diff --git a/device-common.mk b/device-common.mk
index 43d5737..3334d03 100644
--- a/device-common.mk
+++ b/device-common.mk
@@ -84,12 +84,6 @@
 PRODUCT_PACKAGES += \
     keystore.grouper
 
-# for bugmailer
-PRODUCT_PACKAGES += send_bug
-PRODUCT_COPY_FILES += \
-    system/extras/bugmailer/bugmailer.sh:system/bin/bugmailer.sh \
-    system/extras/bugmailer/send_bug:system/bin/send_bug
-
 # NFC packages
 PRODUCT_PACKAGES += \
     nfc.grouper \
diff --git a/init.grouper.rc b/init.grouper.rc
index 877c33a..5315185 100644
--- a/init.grouper.rc
+++ b/init.grouper.rc
@@ -317,7 +317,9 @@
     class late_start
 
 # bugreport is triggered by the VOLUME-DOWN and VOLUME-UP keys
-service bugreport /system/bin/bugmailer.sh -b /system/media/audio/ui/Dock.ogg -e /system/media/audio/ui/Undock.ogg
+service bugreport /system/bin/dumpstate -d -p -B \
+        -o /data/data/com.android.shell/files/bugreports/bugreport \
+        -b /system/media/audio/ui/Dock.ogg -e /system/media/audio/ui/Undock.ogg
     class main
     disabled
     oneshot