diff --git a/platform/android/MapboxGLAndroidSDK/proguard-rules.pro b/platform/android/MapboxGLAndroidSDK/proguard-rules.pro
index c805eee19..85754a75a 100644
--- a/platform/android/MapboxGLAndroidSDK/proguard-rules.pro
+++ b/platform/android/MapboxGLAndroidSDK/proguard-rules.pro
@@ -17,3 +17,12 @@
 
 # Package views
 -keep class com.mapbox.mapboxsdk.views.** { *; }
+
+# Package layers
+-keep class com.mapbox.mapboxsdk.layers.** { *; }
+
+# Package camera
+-keep class com.mapbox.mapboxsdk.camera.** { *; }
+
+# Gesture package
+-keep class almeros.android.multitouch.gesturedetectors.** { *; }
\ No newline at end of file
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/proguard-rules.pro b/platform/android/MapboxGLAndroidSDKTestApp/proguard-rules.pro
index 43a408f33..c6445ac6a 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/proguard-rules.pro
+++ b/platform/android/MapboxGLAndroidSDKTestApp/proguard-rules.pro
@@ -1,3 +1,8 @@
 # Mapbox ProGuard configuration is handled in the SDK
 
--keep class android.support.** { *; }
\ No newline at end of file
+-keep class android.support.** { *; }
+
+-dontwarn retrofit.**
+-keep class retrofit.** { *; }
+-keepattributes Signature
+-keepattributes Exceptions
\ No newline at end of file