diff --git a/custom_rules.xml b/custom_rules.xml
index 5a6f4169c..4771fa06e 100644
--- a/custom_rules.xml
+++ b/custom_rules.xml
@@ -44,6 +44,7 @@
 			<class name="org.linphone.core.PresenceNoteImpl" />
 			<class name="org.linphone.core.PresencePersonImpl" />
 			<class name="org.linphone.core.PresenceServiceImpl" />
+			<class name="org.linphone.core.ErrorInfoImpl" />
 		</javah>
 		<javah outputfile="gen/xml2lpc_jni.h">
 			<classpath>
diff --git a/submodules/belle-sip b/submodules/belle-sip
index 6a1b48f66..d6d8eaae7 160000
--- a/submodules/belle-sip
+++ b/submodules/belle-sip
@@ -1 +1 @@
-Subproject commit 6a1b48f667266e0632e799183f033c88645a62de
+Subproject commit d6d8eaae79490106c655ec76c157090431eb993e
diff --git a/submodules/linphone b/submodules/linphone
index 9de8fe1b7..9d31ca0e5 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit 9de8fe1b7659aecc3ceeb456484e7ec4c3af3ca0
+Subproject commit 9d31ca0e5d967b0cb1194955d9d3626312bcf150