diff --git a/.classpath b/.classpath
index aefe1a96e..c48ad169e 100644
--- a/.classpath
+++ b/.classpath
@@ -5,6 +5,7 @@
 	<classpathentry kind="src" path="submodules/linphone/java/j2se"/>
 	<classpathentry kind="src" path="submodules/linphone/java/common"/>
 	<classpathentry kind="src" path="submodules/linphone/java/impl"/>
+	<classpathentry kind="src" path="submodules/externals/axmlrpc/src/main/java"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="submodules/linphone/coreapi/help/java"/>
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
diff --git a/.gitmodules b/.gitmodules
index 9f5ce1d81..dc550ebff 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -64,3 +64,6 @@
 [submodule "submodules/externals/libupnp"]
 	path = submodules/externals/libupnp
 	url = git://git.code.sf.net/p/pupnp/code
+[submodule "submodules/externals/axmlrpc"]
+	path = submodules/externals/axmlrpc
+	url = git://git.linphone.org/axmlrpc.git
diff --git a/ant.properties b/ant.properties
index 7ddeeeb30..7f65258e5 100644
--- a/ant.properties
+++ b/ant.properties
@@ -1,3 +1,3 @@
-source.dir=src:submodules/linphone/mediastreamer2/java/src:submodules/linphone/java/j2se:submodules/linphone/java/common:submodules/linphone/java/impl:submodules/linphone/coreapi/help/java
+source.dir=src:submodules/linphone/mediastreamer2/java/src:submodules/linphone/java/j2se:submodules/linphone/java/common:submodules/linphone/java/impl:submodules/linphone/coreapi/help/java:submodules/externals/axmlrpc/src/main/java
 key.store=bc-android.keystore
 key.alias=nw8000
diff --git a/custom_rules.xml b/custom_rules.xml
index cda9d1e46..2e6e2dde5 100644
--- a/custom_rules.xml
+++ b/custom_rules.xml
@@ -71,7 +71,7 @@
 			destdir="${javadoc.dir}"
 			verbose="off" 
 		    use="true" 
-		    classpath="${sdk.dir}/platforms/${target}/android.jar:libs/aXMLRPC.jar:libs/android-support-v4.jar:libs/gcm.jar"
+		    classpath="${sdk.dir}/platforms/${target}/android.jar:libs/android-support-v4.jar:libs/gcm.jar"
 		    sourcepath="${source.dir}:gen"
 			linkoffline="http://developer.android.com/reference file:/${sdk.dir}/docs/reference"
     		stylesheetfile="${sdk.dir}/docs/assets/android-developer-docs.css">
diff --git a/libs/aXMLRPC.jar b/libs/aXMLRPC.jar
deleted file mode 100644
index 9cf8f61e0..000000000
Binary files a/libs/aXMLRPC.jar and /dev/null differ
diff --git a/submodules/externals/axmlrpc b/submodules/externals/axmlrpc
new file mode 160000
index 000000000..c47eaa453
--- /dev/null
+++ b/submodules/externals/axmlrpc
@@ -0,0 +1 @@
+Subproject commit c47eaa453fb75d55d32304413672c16706af85e0