diff --git a/build.gradle b/build.gradle
index 0da523a6..8bde38af 100644
--- a/build.gradle
+++ b/build.gradle
@@ -72,6 +72,8 @@ android {
             debuggable true
         }
         release {
+            minifyEnabled true
+            proguardFile getDefaultProguardFile('proguard-android.txt')
             if (System.getenv("key_alias")) {
                 signingConfig signingConfigs.release
             }
diff --git a/proguard-android.txt b/proguard-android.txt
new file mode 100644
index 00000000..fb4c375e
--- /dev/null
+++ b/proguard-android.txt
@@ -0,0 +1,3 @@
+# Fix appcompat-v7 v21.0.0 causing crash on Samsung devices with Android v4.2.2 (https://code.google.com/p/android/issues/detail?id=78377)
+-keep class !android.support.v7.internal.view.menu.MenuBuilder, !android.support.v7.internal.view.menu.SubMenuBuilder, android.support.v7.** { *; }
+-keep interface android.support.v7.** { *; }