diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index e18983df..2f3cbb25 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -41,6 +41,16 @@ THE SOFTWARE.
 			android:name="com.mirrorlink.android.rockscout.allow-offline-access"
 			android:value="true" />
 
+		<provider
+			android:name="android.support.v4.content.FileProvider"
+			android:authorities="ch.blinkenlights.android.vanilla.fileprovider"
+			android:exported="false"
+			android:grantUriPermissions="true">
+			<meta-data
+				android:name="android.support.FILE_PROVIDER_PATHS"
+				android:resource="@xml/provider_paths"/>
+		</provider>
+
 		<activity
 			android:name="FullPlaybackActivity"
 			android:launchMode="singleTask" />
diff --git a/res/values/translatable.xml b/res/values/translatable.xml
index 2a134d10..754cc783 100644
--- a/res/values/translatable.xml
+++ b/res/values/translatable.xml
@@ -320,6 +320,7 @@ THE SOFTWARE.
 	<string name="reverse_sort">Reverse sort</string>
 
 	<string name="share">Share…</string>
+	<string name="share_failed">Failed to share file</string>
 	<string name="sendto">Send to…</string>
 	<string name="no_receiving_apps">No receiving apps found for this media type!</string>
 
diff --git a/res/xml/provider_paths.xml b/res/xml/provider_paths.xml
new file mode 100644
index 00000000..58c9ed26
--- /dev/null
+++ b/res/xml/provider_paths.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<paths>
+	<external-path name="external" path="." />
+</paths>
diff --git a/src/ch/blinkenlights/android/vanilla/FullPlaybackActivity.java b/src/ch/blinkenlights/android/vanilla/FullPlaybackActivity.java
index 3f314e7c..c1344702 100644
--- a/src/ch/blinkenlights/android/vanilla/FullPlaybackActivity.java
+++ b/src/ch/blinkenlights/android/vanilla/FullPlaybackActivity.java
@@ -377,7 +377,7 @@ public class FullPlaybackActivity extends SlidingPlaybackActivity
 			break;
 		case MENU_SHARE:
 			if (song != null)
-				MediaUtils.shareMedia(this, MediaUtils.TYPE_SONG, song.id);
+				MediaUtils.shareMedia(this, song);
 			break;
 		case MENU_DELETE:
 			final PlaybackService playbackService = PlaybackService.get(this);
diff --git a/src/ch/blinkenlights/android/vanilla/MediaUtils.java b/src/ch/blinkenlights/android/vanilla/MediaUtils.java
index 2cd2fc8a..5fc2f0e1 100644
--- a/src/ch/blinkenlights/android/vanilla/MediaUtils.java
+++ b/src/ch/blinkenlights/android/vanilla/MediaUtils.java
@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2010, 2011 Christopher Eby <kreed@kreed.org>
+ * Copyright (C) 2017 Adrian Ulrich <adrian@blinkenlights.ch>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -44,6 +45,7 @@ import android.database.Cursor;
 import android.net.Uri;
 import android.os.Environment;
 import android.provider.MediaStore;
+import android.support.v4.content.FileProvider;
 import android.text.TextUtils;
 import android.database.MatrixCursor;
 import android.util.Log;
@@ -245,7 +247,7 @@ public class MediaUtils {
 		String query = MediaLibrary.GenreSongColumns.SONG_ID+"=?";
 		String[] queryArgs = new String[] { Long.toString(id) };
 
-		Cursor cursor = MediaLibrary.queryLibrary(context, MediaLibrary.TABLE_GENRES_SONGS, projection, query, queryArgs, null); 
+		Cursor cursor = MediaLibrary.queryLibrary(context, MediaLibrary.TABLE_GENRES_SONGS, projection, query, queryArgs, null);
 		if (cursor != null) {
 			if (cursor.moveToNext())
 				return cursor.getLong(0);
@@ -375,35 +377,31 @@ public class MediaUtils {
 	}
 
 	/**
-	 * Creates and sends share intent across the system. Includes all eligible songs found
-	 * within this type and id (e.g. all songs in album, all songs for this artist etc.)
-	 * @param ctx context to execute resolving on
-	 * @param type media type to look for e.g. {@link MediaUtils#TYPE_SONG}
-	 * @param id id of item to send
+	 * Creates and sends a share intent across the system.
+	 * @param ctx context to execute resolving on.
+	 * @param song the song to share.
 	 */
-	public static void shareMedia(Context ctx, int type, long id) {
-		if (type == TYPE_INVALID || id <= 0) { // invalid
+	public static void shareMedia(Context ctx, Song song) {
+		if (song == null || song.path == null)
 			return;
-		}
-
-		String[] projection = new String [] { MediaLibrary.SongColumns._ID, MediaLibrary.SongColumns.PATH };
-		Cursor cursor = buildQuery(type, id, projection, null).runQuery(ctx);
-		if(cursor == null) {
-			return;
-		}
 
+		Uri uri = null;
 		try {
-			while (cursor.moveToNext()) { // for all songs resolved...
-				File songFile = new File(cursor.getString(1));
-				Intent share = new Intent(Intent.ACTION_SEND);
-				share.setType("audio/*");
-				share.putExtra(Intent.EXTRA_STREAM, Uri.fromFile(songFile));
-				ctx.startActivity(Intent.createChooser(share, ctx.getResources().getString(R.string.sendto)));
-			}
-		} catch (ActivityNotFoundException ex) {
+			uri = FileProvider.getUriForFile(ctx, ctx.getApplicationContext().getPackageName() + ".fileprovider", new File(song.path));
+		} catch (IllegalArgumentException e) {
+			Toast.makeText(ctx, R.string.share_failed, Toast.LENGTH_SHORT).show();
+		}
+
+		if (uri == null)
+			return; // Fileprovider failed, we can not continue.
+
+		Intent intent = new Intent(Intent.ACTION_SEND);
+		intent.setType("audio/*");
+		intent.putExtra(Intent.EXTRA_STREAM, uri);
+		try {
+			ctx.startActivity(Intent.createChooser(intent, ctx.getString(R.string.sendto)));
+		} catch (ActivityNotFoundException e) {
 			Toast.makeText(ctx, R.string.no_receiving_apps, Toast.LENGTH_SHORT).show();
-		} finally {
-			cursor.close();
 		}
 	}