diff --git a/.gitignore b/.gitignore
index d7f8f94241..4f90608b8a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,7 +11,7 @@ g_*.png
 mm_*.png
 mx_*.png
 OsmAndCore_wrapper.jar
-OsmAndCore_android.aar
+OsmAndCore_*.aar
 *.class
 *.iml
 .settings
diff --git a/OsmAnd/build.xml b/OsmAnd/build.xml
index 6463fca2f9..a9a92897e1 100644
--- a/OsmAnd/build.xml
+++ b/OsmAnd/build.xml
@@ -32,9 +32,22 @@
 	        </patternset>
 	        <cutdirsmapper dirs="1"/>
 	    </unzip>
+	    <unzip src="OsmAndCore_android.aar" dest="libs">
+	        <patternset>
+	            <include name="jni/armeabi-v7a/*"/>
+	        </patternset>
+	        <cutdirsmapper dirs="1"/>
+	    </unzip>
 	    <unzip src="OsmAndCore_android.aar" dest=".">
 	        <patternset>
 	            <include name="assets/**/*"/>
+	            <exclude name="assets/OsmAndCore_ResourcesBundle/map/fonts/**/*"/>
+	        </patternset>
+	    </unzip>
+	    <unzip src="OsmAndCore_android.aar" dest=".">
+	        <patternset>
+	            <include name="assets/**/map/fonts/OpenSans/*"/>
+	            <include name="assets/**/map/fonts/NotoSans/*"/>
 	        </patternset>
 	    </unzip>
 	</target>