diff --git a/crash_reporter/crash_reporter_logs.conf b/crash_reporter/crash_reporter_logs.conf
index 70ed25841..6f8ad343b 100644
--- a/crash_reporter/crash_reporter_logs.conf
+++ b/crash_reporter/crash_reporter_logs.conf
@@ -31,6 +31,15 @@ crash_reporter-user-collection:echo "===ps output==="; ps axw -o user,pid,%cpu,%
 # run for kernel errors reported through udev events.
 crash_reporter-udev-collection-change-card0-drm:for dri in /sys/kernel/debug/dri/*; do echo "===$dri/i915_error_state==="; cat $dri/i915_error_state; done
 
+# TODO(mkrebs,sabercrombie): Because these can be quite large (600KB
+# compressed), remove this when GPU hangs are no longer an issue, and/or we
+# start collecting "chrome" crashes for normal images.
+# Collect i915 error state for Chrome crashes as well.  See
+# crosbug.com/36979.  These can be big (i.e. megabytes), so compress them with
+# gzip.  Note that the file attached to the crash report will have a ".log"
+# extension, but will have been gzip'ed.
+chrome:for dri in /sys/kernel/debug/dri/*; do echo "===$dri/i915_error_state==="; cat $dri/i915_error_state; done | gzip -c
+
 # When trackpad driver cyapa detects some abnormal behavior, we collect
 # additional logs from kernel messages.
 crash_reporter-udev-collection-change--i2c-cyapa:grep cyapa /var/log/messages