diff --git a/deliver_sdk.sh b/deliver_sdk.sh
index 79b31e5ad..d3a0013ba 100755
--- a/deliver_sdk.sh
+++ b/deliver_sdk.sh
@@ -1,9 +1,9 @@
 #!/bin/sh
 
-rm ../liblinphone-android-sdk.zip
+rm -f ../liblinphone-android-sdk.zip
 zip -r ../liblinphone-android-sdk.zip submodules/linphone/coreapi/help/java libs src/org/linphone/core submodules/linphone/java/j2se/ submodules/linphone/java/common res/layout/hello_world.xml res/layout/videotest.xml src/org/linphone/core/ src/org/linphone/Hacks.java
 
-javadoc -d liblinphone-android-javadoc "org.linphone" src/org/linphone/*.java src/org/linphone/core/*.java src/org/linphone/core/tutorials/* src/org/linphone/component/* submodules/linphone/java/common/org/linphone/core/*.java submodules/linphone/java/j2se/org/linphone/core/*.java
-rm ../liblinphone-android-javadoc.zip
+javadoc -d liblinphone-android-javadoc  src/org/linphone/*.java src/org/linphone/ui/*.java src/org/linphone/core/*.java src/org/linphone/core/video/*.java src/org/linphone/core/tutorials/* submodules/linphone/java/common/org/linphone/core/*.java submodules/linphone/java/j2se/org/linphone/core/*.java
+rm -f ../liblinphone-android-javadoc.zip
 zip -r ../liblinphone-android-javadoc.zip liblinphone-android-javadoc
 rm -rf liblinphone-android-javadoc
diff --git a/src/org/linphone/LinphoneManager.java b/src/org/linphone/LinphoneManager.java
index 2290e6573..198143af7 100644
--- a/src/org/linphone/LinphoneManager.java
+++ b/src/org/linphone/LinphoneManager.java
@@ -155,7 +155,7 @@ public final class LinphoneManager implements LinphoneCoreListener {
 
 	}
 	
-	public static final String TAG="Linphone";
+	public static final String TAG=Version.TAG;
 	private static final int LINPHONE_VOLUME_STREAM = STREAM_VOICE_CALL;
 	private static final int dbStep = 4;
 	/** Called when the activity is first created. */
diff --git a/src/org/linphone/core/Hacks.java b/src/org/linphone/core/Hacks.java
index 23ebcb487..0eea6a814 100644
--- a/src/org/linphone/core/Hacks.java
+++ b/src/org/linphone/core/Hacks.java
@@ -18,8 +18,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 package org.linphone.core;
 
-import org.linphone.LinphoneManager;
-
 import android.media.AudioManager;
 import android.os.Build;
 import android.util.Log;
@@ -94,8 +92,8 @@ public final class Hacks {
 		//MANUFACTURER doesn't exist in android 1.5.
 		//sb.append("MANUFACTURER=").append(Build.MANUFACTURER).append("\n");
 		sb.append("SDK=").append(Build.VERSION.SDK);
-		
-		Log.d(LinphoneManager.TAG, sb.toString());
+
+		Log.d(Version.TAG, sb.toString());
 	}
 
 	public static boolean needSoftvolume() {
diff --git a/src/org/linphone/core/LinphoneCoreFactoryImpl.java b/src/org/linphone/core/LinphoneCoreFactoryImpl.java
index b676ccd61..0a9ba7a76 100644
--- a/src/org/linphone/core/LinphoneCoreFactoryImpl.java
+++ b/src/org/linphone/core/LinphoneCoreFactoryImpl.java
@@ -21,8 +21,6 @@ package org.linphone.core;
 import java.io.File;
 import java.io.IOException;
 
-import org.linphone.LinphoneManager;
-
 import android.util.Log;
 
 public class LinphoneCoreFactoryImpl extends LinphoneCoreFactory {
@@ -31,7 +29,7 @@ public class LinphoneCoreFactoryImpl extends LinphoneCoreFactory {
 		try {
 			System.loadLibrary(s);
 		} catch (Throwable e) {
-			Log.w(LinphoneManager.TAG, "Unable to load optional library lib" + s);
+			Log.w(Version.TAG, "Unable to load optional library lib" + s);
 		}
 	}
 
diff --git a/src/org/linphone/core/Version.java b/src/org/linphone/core/Version.java
index 8064cb176..350189eea 100644
--- a/src/org/linphone/core/Version.java
+++ b/src/org/linphone/core/Version.java
@@ -26,6 +26,8 @@ import android.os.Build;
  */
 public class Version {
 
+	public static final String TAG="Linphone";
+
 	private static final int buildVersion = 
 		Integer.parseInt(Build.VERSION.SDK);
 //		8; // 2.2