diff --git a/prepare-upload.sh b/prepare-upload.sh
index d394be8..2be51c8 100644
--- a/prepare-upload.sh
+++ b/prepare-upload.sh
@@ -4,16 +4,18 @@ VERSION=$1
 set -e
 
 UPLOAD_FOLDER=./target/to_upload
-MVN_FOLDER=$VERSION/maven
+MVN_FOLDER=maven
 
-ZS_CORE_PATH=$UPLOAD_FOLDER/zkspring-core/$MVN_FOLDER
-ZS_SECURITY_PATH=$UPLOAD_FOLDER/zkspring-security/$MVN_FOLDER
+ZS_CORE_PATH=$UPLOAD_FOLDER/zkspring-core
+ZS_SECURITY_PATH=$UPLOAD_FOLDER/zkspring-security
 
 rm -rf $UPLOAD_FOLDER
 
-mkdir -p $ZS_CORE_PATH
-mkdir -p $ZS_SECURITY_PATH
+mkdir -p $ZS_CORE_PATH/$VERSION/$MVN_FOLDER
+mkdir -p $ZS_SECURITY_PATH/$VERSION/$MVN_FOLDER
 
-cp zkspring-core/target/zkspring-core-$VERSION-bundle.jar $ZS_CORE_PATH
+cp zkspring-core/target/zkspring-core-$VERSION-javadoc.jar $ZS_CORE_PATH/$VERSION/
+cp zkspring-core/target/zkspring-core-$VERSION-bundle.jar $ZS_CORE_PATH/$VERSION/$MVN_FOLDER
 
-cp zkspring-security/target/zkspring-security-$VERSION-bundle.jar $ZS_SECURITY_PATH
+cp zkspring-security/target/zkspring-security-$VERSION-javadoc.jar $ZS_SECURITY_PATH/$VERSION/
+cp zkspring-security/target/zkspring-security-$VERSION-bundle.jar $ZS_SECURITY_PATH/$VERSION/$MVN_FOLDER
diff --git a/release b/release
index 88b3334..11e6e9d 100644
--- a/release
+++ b/release
@@ -17,7 +17,7 @@ set -e
 bash ./upVer $ver-SNAPSHOT $pver
 
 mvn clean install -pl zkspring-security -am
-mvn source:jar repository:bundle-create --batch-mode -DskipTests -pl zkspring-security -am
+mvn source:jar javadoc:jar repository:bundle-create --batch-mode -DskipTests -pl zkspring-security -am
 
 cd $maindir
 bash ./prepare-upload.sh $pver