diff --git a/OsmAnd/AndroidManifest-free.xml b/OsmAnd/AndroidManifest-free.xml
index bbfd7c5cf0..6782e2ec24 100644
--- a/OsmAnd/AndroidManifest-free.xml
+++ b/OsmAnd/AndroidManifest-free.xml
@@ -1,11 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-              xmlns:tools="http://schemas.android.com/tools">
-	<application tools:replace="android:icon"
-		android:icon="@drawable/icon_free">
-		<service tools:replace="android:process"
-		    android:process="net.osmand"
-			android:name="net.osmand.plus.NavigationService"/>
+          xmlns:tools="http://schemas.android.com/tools">
 
-		</application>
+    <application
+        android:icon="@drawable/icon_free"
+        tools:replace="android:icon">
+
+        <service
+            android:name="net.osmand.plus.NavigationService"
+            tools:replace="android:process"
+            android:process="net.osmand"/>
+
+        <provider
+            android:name="android.support.v4.content.FileProvider"
+            tools:replace="android:authorities"
+            android:authorities="net.osmand.fileprovider"/>
+    </application>
 </manifest> 
\ No newline at end of file
diff --git a/OsmAnd/AndroidManifest-freedev.xml b/OsmAnd/AndroidManifest-freedev.xml
index addf561555..bc527a3eed 100644
--- a/OsmAnd/AndroidManifest-freedev.xml
+++ b/OsmAnd/AndroidManifest-freedev.xml
@@ -1,11 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-              xmlns:tools="http://schemas.android.com/tools">
-	<application tools:replace="android:icon"
-		android:icon="@drawable/icon_free">
-		<service tools:replace="android:process"
-		    android:process="net.osmand.dev"
-			android:name="net.osmand.plus.NavigationService"/>
-		
-		</application>
+          xmlns:tools="http://schemas.android.com/tools">
+
+    <application
+        android:icon="@drawable/icon_free"
+        tools:replace="android:icon">
+        <service
+            android:name="net.osmand.plus.NavigationService"
+            android:process="net.osmand.dev"
+            tools:replace="android:process"/>
+        <provider
+            android:name="android.support.v4.content.FileProvider"
+            android:authorities="net.osmand.dev.fileprovider"
+            tools:replace="android:authorities"/>
+    </application>
 </manifest> 
diff --git a/OsmAnd/AndroidManifest.xml b/OsmAnd/AndroidManifest.xml
index 4b1721d410..088c5652ae 100644
--- a/OsmAnd/AndroidManifest.xml
+++ b/OsmAnd/AndroidManifest.xml
@@ -64,7 +64,7 @@
         
         <provider
             android:name="android.support.v4.content.FileProvider"
-            android:authorities="net.osmand.fileprovider"
+            android:authorities="net.osmand.plus.fileprovider"
             android:exported="false"
             android:grantUriPermissions="true" >
             <meta-data
diff --git a/OsmAnd/src/net/osmand/plus/activities/FavoritesTreeFragment.java b/OsmAnd/src/net/osmand/plus/activities/FavoritesTreeFragment.java
index 880cd07732..27990f182f 100644
--- a/OsmAnd/src/net/osmand/plus/activities/FavoritesTreeFragment.java
+++ b/OsmAnd/src/net/osmand/plus/activities/FavoritesTreeFragment.java
@@ -580,7 +580,9 @@ public class FavoritesTreeFragment extends OsmandExpandableListFragment {
 						sendIntent.setAction(Intent.ACTION_SEND);
 						sendIntent.putExtra(Intent.EXTRA_TEXT, "Favourites.gpx:\n\n\n" + GPXUtilities.asString(gpxFile, getMyApplication()));
 						sendIntent.putExtra(Intent.EXTRA_SUBJECT, getString(R.string.share_fav_subject));
-						sendIntent.putExtra(Intent.EXTRA_STREAM, FileProvider.getUriForFile(getActivity(), "net.osmand.fileprovider", dst));
+						sendIntent.putExtra(Intent.EXTRA_STREAM,
+								FileProvider.getUriForFile(getActivity(),
+										getActivity().getPackageName() + ".fileprovider", dst));
 						sendIntent.setType("text/plain");
 						startActivity(sendIntent);
 					} catch (IOException e) {