diff --git a/OsmAnd/build.gradle b/OsmAnd/build.gradle
index 2139f1f771..d00e8e4ebc 100644
--- a/OsmAnd/build.gradle
+++ b/OsmAnd/build.gradle
@@ -141,9 +141,11 @@ android {
 
 	buildTypes {
 		debug {
+			proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-project.txt'
 			signingConfig signingConfigs.development
 		}
 		release {
+			proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-project.txt'
 			signingConfig signingConfigs.publishing
 		}
 	}
diff --git a/OsmAnd/proguard-project.txt b/OsmAnd/proguard-project.txt
index f2fe1559a2..daa62ebbed 100755
--- a/OsmAnd/proguard-project.txt
+++ b/OsmAnd/proguard-project.txt
@@ -1,20 +1,23 @@
-# To enable ProGuard in your project, edit project.properties
-# to define the proguard.config property as described in that file.
-#
-# Add project specific ProGuard rules here.
-# By default, the flags in this file are appended to flags specified
-# in ${sdk.dir}/tools/proguard/proguard-android.txt
-# You can edit the include path and order by changing the ProGuard
-# include property in project.properties.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# Add any project specific keep options here:
-
 # If your project uses WebView with JS, uncomment the following
 # and specify the fully qualified class name to the JavaScript interface
 # class:
 #-keepclassmembers class fqcn.of.javascript.interface.for.webview {
 #   public *;
 #}
+# Allow obfuscation of android.support.v7.internal.view.menu.**
+# to avoid problem on Samsung 4.2.2 devices with appcompat v21
+# see https://code.google.com/p/android/issues/detail?id=78377
+-keep class !android.support.v7.internal.view.menu.**,android.support.** {*;}
+-keep class net.osmand.** { *; }
+-keep interface net.osmand.** { *; }
+
+-keep class com.google.** { *; }
+-keep interface com.google.** { *; }
+-keep class com.jwetherell.** { *; }
+-keep interface com.jwetherell.** { *; }
+
+-keep class btools.** { *; }
+-keep interface btools.** { *; }
+-keep class alice.** { *; }
+-keep interface alice.** { *; }
+-dontwarn alice.**
\ No newline at end of file