diff --git a/metadata/net.osmand.plus.txt b/metadata/net.osmand.plus.txt
index 4b63918ef5..9d7c0ad2a5 100644
--- a/metadata/net.osmand.plus.txt
+++ b/metadata/net.osmand.plus.txt
@@ -106,17 +106,17 @@ Build:1.5-MIPS,143
     forcevercode=yes
     rm=SherlockBar/build.xml
     extlibs=perms-osmand_145.diff
-    srclibs=OsmAnd-tools@bfee93a8d;OsmAnd-core@r1.1.4;resources@836be71481
+    srclibs=OsmAnd-tools@bfee93a8d;OsmAnd-core@r1.1.4;OsmAnd-resources@836be71481
     patch=remove_analytics_android_145.diff
-    prebuild=rm ../../core/OsmAnd-java/src/net/osmand/plus/download/DownloadTracker.java && \
+    prebuild=rm ../../OsmAnd-core/OsmAnd-java/src/net/osmand/plus/download/DownloadTracker.java && \
         sed -i 's/debuggable="true"/debuggable="false"/g' AndroidManifest.xml && \
         $$SDK$$/tools/android update project -p ../SherlockBar && \
-        sed -i 's/app_version">[^<]*/app_version">1.5-MIPS/'            res/values/no_translate.xml && \
+        sed -i 's/app_version">[^<]*/app_version">1.5-MIPS/' res/values/no_translate.xml && \
         sed -i '/keys/d' ant.properties && \
-        cd ../../core/ && \
+        cd ../../OsmAnd-core/ && \
         git apply ../android/OsmAnd/libs/perms-osmand_145.diff
     build=ANDROID_SDK=$$SDK$$ ANDROID_NDK=$$NDK$$ OSMAND_MIPS_ONLY=true ./ndk-build.sh && \
-        ant jar native-libs -f $$tools$$/OsmAndMapCreator/build.xml && \
+        ant jar native-libs -f $$OsmAnd-tools$$/OsmAndMapCreator/build.xml && \
         ant build -f ../OsmAnd-java/build.xml
     buildjni=no
 
@@ -127,17 +127,17 @@ Build:1.5-X86,144
     forcevercode=yes
     rm=SherlockBar/build.xml
     extlibs=perms-osmand_145.diff
-    srclibs=OsmAnd-tools@bfee93a8d;OsmAnd-core@r1.1.4;resources@836be71481
+    srclibs=OsmAnd-tools@bfee93a8d;OsmAnd-core@r1.1.4;OsmAnd-resources@836be71481
     patch=remove_analytics_android_145.diff
-    prebuild=rm ../../core/OsmAnd-java/src/net/osmand/plus/download/DownloadTracker.java && \
+    prebuild=rm ../../OsmAnd-core/OsmAnd-java/src/net/osmand/plus/download/DownloadTracker.java && \
         sed -i 's/debuggable="true"/debuggable="false"/g' AndroidManifest.xml && \
         $$SDK$$/tools/android update project -p ../SherlockBar && \
-        sed -i 's/app_version">[^<]*/app_version">1.5-X86/'            res/values/no_translate.xml && \
+        sed -i 's/app_version">[^<]*/app_version">1.5-X86/' res/values/no_translate.xml && \
         sed -i '/keys/d' ant.properties && \
-        cd ../../core/ && \
+        cd ../../OsmAnd-core/ && \
         git apply ../android/OsmAnd/libs/perms-osmand_145.diff
     build=ANDROID_SDK=$$SDK$$ ANDROID_NDK=$$NDK$$ OSMAND_X86_ONLY=true ./ndk-build.sh && \
-        ant jar native-libs -f $$tools$$/OsmAndMapCreator/build.xml && \
+        ant jar native-libs -f $$OsmAnd-tools$$/OsmAndMapCreator/build.xml && \
         ant build -f ../OsmAnd-java/build.xml
     buildjni=no
 
@@ -148,18 +148,30 @@ Build:1.5-ARM,145
     forcevercode=yes
     rm=SherlockBar/build.xml
     extlibs=perms-osmand_145.diff;osmand-zlib-url_145.patch
-    srclibs=OsmAnd-tools@bfee93a8d;OsmAnd-core@r1.1.4;resources@836be71481
+    srclibs=OsmAnd-tools@bfee93a8d;OsmAnd-core@r1.1.4;OsmAnd-resources@836be71481
     patch=remove_analytics_android_145.diff
-    prebuild=rm ../../core/OsmAnd-java/src/net/osmand/plus/download/DownloadTracker.java && \
+    prebuild=rm ../../OsmAnd-core/OsmAnd-java/src/net/osmand/plus/download/DownloadTracker.java && \
         sed -i 's/debuggable="true"/debuggable="false"/g' AndroidManifest.xml && \
         $$SDK$$/tools/android update project -p ../SherlockBar && \
         sed -i 's/app_version">[^<]*/app_version">1.5-ARM/' res/values/no_translate.xml && \
         sed -i '/keys/d' ant.properties && \
-        cd ../../core/ && \
+        cd ../../OsmAnd-core/ && \
         git apply ../android/OsmAnd/libs/perms-osmand_145.diff && \
         git apply ../android/OsmAnd/libs/osmand-zlib-url_145.patch
     build=ANDROID_SDK=$$SDK$$ ANDROID_NDK=$$NDK$$ OSMAND_ARM_ONLY=true ./ndk-build.sh && \
-        ant jar native-libs -f $$tools$$/OsmAndMapCreator/build.xml && \
+        ant jar native-libs -f $$OsmAnd-tools$$/OsmAndMapCreator/build.xml && \
+        ant build -f ../OsmAnd-java/build.xml
+    buildjni=no
+
+Build:1.6.5,170
+    commit=f261ae846932c5f
+    subdir=OsmAnd
+    encoding=utf-8
+    forcevercode=yes
+    srclibs=OsmAnd-tools@bfee93a8d;OsmAnd-core@r1.1.4;OsmAnd-resources@836be71481
+    prebuild=sed -i 's/debuggable="true"/debuggable="false"/g' AndroidManifest.xml
+    build=ANDROID_SDK=$$SDK$$ ANDROID_NDK=$$NDK$$ OSMAND_ARM_ONLY=true ./ndk-build.sh && \
+        ant jar native-libs -f $$OsmAnd-tools$$/OsmAndMapCreator/build.xml && \
         ant build -f ../OsmAnd-java/build.xml
     buildjni=no
 
diff --git a/srclibs/resources.txt b/srclibs/OsmAnd-resources.txt
similarity index 100%
rename from srclibs/resources.txt
rename to srclibs/OsmAnd-resources.txt