diff --git a/deliver_sdk.sh b/deliver_sdk.sh
index f02f1ed88..f9709351d 100755
--- a/deliver_sdk.sh
+++ b/deliver_sdk.sh
@@ -28,7 +28,10 @@ cat > $D/.classpath <<EOF
 EOF
 
 # Fix package name
+{
+cd $D
 grep -R "org.linphone.R" . -l  | grep java | xargs sed -i 's/org\.linphone\.R/org\.linphone\.sdk\.R/g'
+}
 
 # Create a basic AndroidManifest.xml
 cat > $D/AndroidManifest.xml <<EOF
@@ -121,8 +124,8 @@ EOF
 
 }
 
-
-D="../liblinphone-android-sdk"
+DBASE="liblinphone-android-sdk"
+D="../$DBASE"
 rm -rf $D.zip $D
 copy submodules/linphone/coreapi/help/java $D
 copy libs $D
@@ -134,9 +137,12 @@ copy res/layout/videotest.xml $D
 
 androidize $D
 
-#Creating zip
-zip -r ../liblinphone-android-sdk.zip $D
-rm -rf $D
+echo "Creating zip $D"
+{
+cd ..
+zip -r liblinphone-android-sdk.zip $DBASE
+rm -rf $DBASE
+}
 
 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