diff --git a/JavaLibrary.mk b/JavaLibrary.mk
index ee9d6f1..57b0dbe 100644
--- a/JavaLibrary.mk
+++ b/JavaLibrary.mk
@@ -92,7 +92,7 @@
 core_all_intermediates := $(call intermediates-dir-for,JAVA_LIBRARIES,core-all,,COMMON)
 core_proguard_obfuscation_flags := \
     -renamesourcefileattribute SourceFile \
-    -keepattributes SourceFile,LineNumberTable \
+    -keepattributes Exceptions,InnerClasses,Signature,Deprecated,SourceFile,LineNumberTable,*Annotation*,EnclosingMethod \
     -dontwarn \*\* \
     -dontshrink \
     -dontoptimize \
diff --git a/proguard/proguard.flags b/proguard/proguard.flags
index 379eae5..3bd7fc5 100644
--- a/proguard/proguard.flags
+++ b/proguard/proguard.flags
@@ -4,7 +4,7 @@
 -applymapping mapping.proguard
 -ignorewarnings
 -renamesourcefileattribute SourceFile
--keepattributes SourceFile,LineNumberTable
+-keepattributes Exceptions,InnerClasses,Signature,Deprecated,SourceFile,LineNumberTable,*Annotation*,EnclosingMethod
 
 -keepnames class java.** {
 *;