diff --git a/README.md b/README.md
index cb88617bf6..a7e46a6462 100644
--- a/README.md
+++ b/README.md
@@ -125,7 +125,7 @@ If you find a new one, please [create an issue](https://github.com/square/leakca
 5. File an issue on [b.android.com](http://b.android.com) with the leak trace and the repro case
 6. Create a PR in LeakCanary to update `AndroidExcludedRefs.java`. Optional: if you find a hack to clear that leak on previous versions of Android, feel free to document it.
 
-This is especially important for **new releases of Android**. You have the opportunity to help detect new memory leaks early on, which benefits the entire Android community. 
+This is especially important for **new releases of Android**. You have the opportunity to help detect new memory leaks early on, which benefits the entire Android community.
 
 ## Beyond the leak trace
 
@@ -317,16 +317,6 @@ public class DebugExampleApplication extends ExampleApplication {
 }
 ```
 
-### ProGuard
-
-If you use Proguard in your debug builds, make sure to keep the HAHA and LeakCanary classes:
-
-```
-# LeakCanary
--keep class org.eclipse.mat.** { *; }
--keep class com.squareup.leakcanary.** { *; }
-```
-
 ## Snapshots of the development version
 
 See the [CHANGELOG](https://github.com/square/leakcanary/blob/master/CHANGELOG.md).
diff --git a/leakcanary-android/consumer-proguard-rules.pro b/leakcanary-android/consumer-proguard-rules.pro
index 741501bb14..48ffcc2870 100644
--- a/leakcanary-android/consumer-proguard-rules.pro
+++ b/leakcanary-android/consumer-proguard-rules.pro
@@ -1,5 +1,9 @@
--keep class org.eclipse.mat.** { *; }
+-dontwarn com.squareup.haha.guava.**
+-dontwarn com.squareup.haha.perflib.**
+-dontwarn com.squareup.haha.trove.**
+-dontwarn com.squareup.leakcanary.**
+-keep class com.squareup.haha.** { *; }
 -keep class com.squareup.leakcanary.** { *; }
 
 # Marshmallow removed Notification.setLatestEventInfo()
--dontwarn android.app.Notification
\ No newline at end of file
+-dontwarn android.app.Notification