diff --git a/init.goldfish.rc b/init.goldfish.rc
index 388a968..b1613a4 100644
--- a/init.goldfish.rc
+++ b/init.goldfish.rc
@@ -110,3 +110,10 @@
 service fingerprintd /system/bin/fingerprintd
     class late_start
     user system
+
+service bugreport /system/bin/dumpstate -d -p -B \
+        -o /data/data/com.android.shell/files/bugreports/bugreport
+    class main
+    disabled
+    oneshot
+    keycodes 114 115 116
diff --git a/init.ranchu.rc b/init.ranchu.rc
index 81e812f..c9abe1d 100644
--- a/init.ranchu.rc
+++ b/init.ranchu.rc
@@ -113,3 +113,10 @@
 service fingerprintd /system/bin/fingerprintd
     class late_start
     user system
+
+service bugreport /system/bin/dumpstate -d -p -B \
+        -o /data/data/com.android.shell/files/bugreports/bugreport
+    class main
+    disabled
+    oneshot
+    keycodes 114 115 116