diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index a30d2cff..b620e61f 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -204,8 +204,8 @@
 
         <activity android:name=".ui.activities.PurchaseActivity"></activity>
         <provider
-            android:name=".GenericFileProvider"
-            android:authorities="${applicationId}.com.kabouzeid.gramophone.provider"
+            android:name="android.support.v4.content.FileProvider"
+            android:authorities="${applicationId}"
             android:exported="false"
             android:grantUriPermissions="true">
             <meta-data
diff --git a/app/src/main/java/com/kabouzeid/gramophone/GenericFileProvider.java b/app/src/main/java/com/kabouzeid/gramophone/GenericFileProvider.java
deleted file mode 100644
index 0196f75d..00000000
--- a/app/src/main/java/com/kabouzeid/gramophone/GenericFileProvider.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.kabouzeid.gramophone;
-
-
-import android.support.v4.content.FileProvider;
-
-public class GenericFileProvider extends FileProvider {
-
-}
diff --git a/app/src/main/java/com/kabouzeid/gramophone/util/MusicUtil.java b/app/src/main/java/com/kabouzeid/gramophone/util/MusicUtil.java
index e9689e3c..61f3984a 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/util/MusicUtil.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/util/MusicUtil.java
@@ -13,18 +13,17 @@ import android.provider.MediaStore;
 import android.provider.Settings;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
+import android.support.v4.content.FileProvider;
 import android.text.TextUtils;
 import android.util.Log;
 import android.widget.Toast;
 
 import com.kabouzeid.gramophone.R;
-import com.kabouzeid.gramophone.GenericFileProvider;
 import com.kabouzeid.gramophone.helper.MusicPlayerRemote;
 import com.kabouzeid.gramophone.loader.PlaylistLoader;
 import com.kabouzeid.gramophone.loader.SongLoader;
 import com.kabouzeid.gramophone.model.Artist;
 import com.kabouzeid.gramophone.model.Playlist;
-import com.kabouzeid.gramophone.model.PlaylistSong;
 import com.kabouzeid.gramophone.model.Song;
 import com.kabouzeid.gramophone.model.lyrics.AbsSynchronizedLyrics;
 
@@ -59,7 +58,7 @@ public class MusicUtil {
     public static Intent createShareSongFileIntent(@NonNull final Song song, Context context) {
         return new Intent()
                 .setAction(Intent.ACTION_SEND)
-                .putExtra(Intent.EXTRA_STREAM, FileProvider.getUriForFile(context, context.getApplicationContext().getPackageName() + ".com.kabouzeid.gramophone.provider", new File(song.data)))
+                .putExtra(Intent.EXTRA_STREAM, FileProvider.getUriForFile(context, context.getApplicationContext().getPackageName(), new File(song.data)))
                 .addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
                 .setType("audio/*");
     }