diff --git a/custom_rules.xml b/custom_rules.xml
index ba9243a4c..a9b967225 100644
--- a/custom_rules.xml
+++ b/custom_rules.xml
@@ -55,7 +55,7 @@
 			destdir="${javadoc.dir}"
 			verbose="off" 
 		    use="true" 
-		    classpath="${sdk.dir}/platforms/${target}/android.jar:libs/aXMLRPC.jar"
+		    classpath="${sdk.dir}/platforms/${target}/android.jar:libs/aXMLRPC.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/deliver_sdk.sh b/deliver_sdk.sh
index b5e2dbb04..ac1b8ea50 100755
--- a/deliver_sdk.sh
+++ b/deliver_sdk.sh
@@ -22,10 +22,14 @@ cat > $D/.classpath <<EOF
 	<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="src"/>
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
 	<classpathentry exported="true" kind="lib" path="libs/aXMLRPC.jar"/>
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
+	<classpathentry kind="lib" path="libs/android-support-v4.jar"/>
+	<classpathentry kind="lib" path="libs/gcm.jar"/>
 	<classpathentry kind="output" path="bin/classes"/>
+	
 </classpath>
 EOF