diff --git a/res/raw-sw600dp/linphonerc_factory b/res/raw-sw600dp/linphonerc_factory
index 68036c795..a1314bcce 100644
--- a/res/raw-sw600dp/linphonerc_factory
+++ b/res/raw-sw600dp/linphonerc_factory
@@ -1,3 +1,7 @@
+#
+#This file shall not contain path referencing package name, in order to be portable when app is renamed.
+#Paths to resources must be set from LinphoneManager, after creating LinphoneCore.
+
 [net]
 mtu=1300
 
@@ -8,7 +12,6 @@ register_only_when_network_is_up=1
 auto_net_state_mon=0
 auto_answer_replacing_calls=1
 ping_with_options=0
-root_ca=/data/data/org.linphone/files/rootca.pem
 
 [rtp]
 audio_rtp_port=7076
@@ -22,11 +25,11 @@ disable_upnp=1
 playback_dev_id=
 ringer_dev_id=
 capture_dev_id=
-remote_ring=/data/data/org.linphone/files/ringback.wav
-local_ring=/data/data/org.linphone/files/oldphone_mono.wav
 dtmf_player_amp=0.1
 
+#remove this property for any application that is not Linphone public version itself
+ec_calibrator_cool_tones=1
+
 [misc]
 max_calls=10
-log_collection_upload_server_url=https://www.linphone.org:444/lft.php
-user_certificates_path=/data/data/org.linphone/files
\ No newline at end of file
+log_collection_upload_server_url=https://www.linphone.org:444/lft.php
\ No newline at end of file
diff --git a/res/raw/linphonerc_factory b/res/raw/linphonerc_factory
index 0790cf3e8..d5fc25e09 100644
--- a/res/raw/linphonerc_factory
+++ b/res/raw/linphonerc_factory
@@ -1,3 +1,7 @@
+
+#
+#This file shall not contain path referencing package name, in order to be portable when app is renamed.
+#Paths to resources must be set from LinphoneManager, after creating LinphoneCore.
 [net]
 mtu=1300
 
@@ -11,7 +15,6 @@ register_only_when_network_is_up=1
 auto_net_state_mon=0
 auto_answer_replacing_calls=1
 ping_with_options=0
-root_ca=/data/data/org.linphone/files/rootca.pem
 
 [rtp]
 audio_rtp_port=7076
@@ -25,8 +28,6 @@ disable_upnp=1
 playback_dev_id=
 ringer_dev_id=
 capture_dev_id=
-remote_ring=/data/data/org.linphone/files/ringback.wav
-local_ring=/data/data/org.linphone/files/oldphone_mono.wav
 dtmf_player_amp=0.1
 
 #remove this property for any application that is not Linphone public version itself
@@ -36,4 +37,4 @@ ec_calibrator_cool_tones=1
 [misc]
 max_calls=10
 log_collection_upload_server_url=https://www.linphone.org:444/lft.php
-user_certificates_path=/data/data/org.linphone/files
+
diff --git a/src/org/linphone/LinphoneManager.java b/src/org/linphone/LinphoneManager.java
index c3a70cf7d..f69301a21 100644
--- a/src/org/linphone/LinphoneManager.java
+++ b/src/org/linphone/LinphoneManager.java
@@ -170,6 +170,7 @@ public class LinphoneManager implements LinphoneCoreListener, LinphoneChatMessag
 		mCallLogDatabaseFile = basePath + "/linphone-log-history.db";
 		mErrorToneFile = basePath + "/error.wav";
 		mConfigFile = basePath + "/configrc";
+		mUserCertificatePath = basePath;
 
 		mPrefs = LinphonePreferences.instance();
 		mAudioManager = ((AudioManager) c.getSystemService(Context.AUDIO_SERVICE));
@@ -194,6 +195,7 @@ public class LinphoneManager implements LinphoneCoreListener, LinphoneChatMessag
 	private final String mCallLogDatabaseFile;
 	private final String mErrorToneFile;
 	private final String mConfigFile;
+	private final String mUserCertificatePath;
 	private ByteArrayInputStream mUploadingImageStream;
 
 	private Timer mTimer;
@@ -643,16 +645,18 @@ public class LinphoneManager implements LinphoneCoreListener, LinphoneChatMessag
 		} catch (NameNotFoundException e) {
 			Log.e(e, "cannot get version name");
 		}
-
+		mLc.setRing(mRingSoundFile);
 		if (mR.getBoolean(R.bool.use_linphonecore_ringing)) {
 			disableRinging();
 		} else {
-			mLc.setRing(null);
+			mLc.setRing(null); //We'll use the android media player api to play the ringtone
 		}
+		mLc.setRingback(mRingbackSoundFile);
 		mLc.setRootCA(mLinphoneRootCaFile);
 		mLc.setPlayFile(mPauseSoundFile);
 		mLc.setChatDatabasePath(mChatDatabaseFile);
 		mLc.setCallLogsDatabasePath(mCallLogDatabaseFile);
+		mLc.setUserCertificatesPath(mUserCertificatePath);
 		//mLc.setCallErrorTone(Reason.NotFound, mErrorToneFile);
 
 		int availableCores = Runtime.getRuntime().availableProcessors();
diff --git a/submodules/linphone b/submodules/linphone
index b65577522..2c929a08c 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit b655775220a61b48e6721139bbd81215423bf179
+Subproject commit 2c929a08c71950a0dab0ab1b97c574d575d3452f