diff --git a/build.gradle b/build.gradle
index 98f0c8453..031a0e8b4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -100,6 +100,12 @@ android {
 		release {
 			runProguard true
 			proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-project.txt'
+			zipAlign true
+		}
+		debug {
+			runProguard true
+			proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-project.txt'
+			zipAlign true
 		}
 	}
 
diff --git a/custom_rules.xml b/custom_rules.xml
index 7747834aa..b4ec86047 100644
--- a/custom_rules.xml
+++ b/custom_rules.xml
@@ -9,4 +9,11 @@
              doctitle="${ant.project.name}" />
   </target>
 
+  <target name="-debug-obfuscation-check">
+    <property name="proguard.enabled" value="true"/>
+
+    <!--To avoid "Multiple dex files define..."-->
+    <path id="out.dex.jar.input.ref" />
+  </target>
+
 </project>