diff --git a/res/values/non_localizable_strings.xml b/res/values/non_localizable_strings.xml
index 8840d5136..7b7a4dc64 100644
--- a/res/values/non_localizable_strings.xml
+++ b/res/values/non_localizable_strings.xml
@@ -23,7 +23,8 @@
 	<string name="pref_audio_hacks_use_galaxys_hack_key">pref_audio_hacks_use_galaxys_hack_key</string>
 	<string name="pref_audio_hacks_use_routing_api_key">pref_audio_hacks_use_routing_api_key</string>
 	<string name="pref_audio_soft_volume_key">pref_audio_soft_volume_key</string>
-
+	<string name="pref_audio_ringtone">pref_audio_ringtone</string>
+	
 	<string name="pref_ipv6_key">pref_ipv6_key</string>
 
 	<string name="pref_transport_udp_key">pref_transport_udp_key</string>
diff --git a/src/org/linphone/LinphoneService.java b/src/org/linphone/LinphoneService.java
index c91fa88b1..df5d91f02 100644
--- a/src/org/linphone/LinphoneService.java
+++ b/src/org/linphone/LinphoneService.java
@@ -532,9 +532,10 @@ public final class LinphoneService extends Service implements LinphoneServiceLis
 
 
 	public void onRingerPlayerCreated(MediaPlayer mRingerPlayer) {
-		final Uri ringtoneUri = RingtoneManager.getDefaultUri(RingtoneManager.TYPE_RINGTONE);
+		String uriString = PreferenceManager.getDefaultSharedPreferences(this).getString(getString(R.string.pref_audio_ringtone), RingtoneManager.getDefaultUri(RingtoneManager.TYPE_RINGTONE).toString());
+		Uri uri = Uri.parse(uriString);
 		try {
-			mRingerPlayer.setDataSource(getApplicationContext(), ringtoneUri);
+			mRingerPlayer.setDataSource(this, uri);
 		} catch (IOException e) {
 			Log.e(e, "cannot set ringtone");
 		}