diff --git a/build/groovy/MacDistributionBuilder.groovy b/build/groovy/MacDistributionBuilder.groovy
index d10c6bc404de..d9877b1f76c0 100644
--- a/build/groovy/MacDistributionBuilder.groovy
+++ b/build/groovy/MacDistributionBuilder.groovy
@@ -13,6 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
+import com.intellij.util.PathUtilRt
 import org.apache.tools.ant.types.Path
 import org.apache.tools.ant.util.SplitClassLoader
 import org.codehaus.gant.GantBuilder
@@ -112,7 +114,7 @@ class MacDistributionBuilder {
       }
     }
 
-    sshExec("./signapp_ce.sh ${sitFileName} ${fullBuildNumber} ${macHostProperties.userName} ${macHostProperties.password} \"${macHostProperties.codesignString}\" \"${customJDKTarPath}\"")
+    sshExec("./signapp_ce.sh ${sitFileName} ${fullBuildNumber} ${macHostProperties.userName} ${macHostProperties.password} \"${macHostProperties.codesignString}\" \"${PathUtilRt.getFileName(customJDKTarPath)}\"")
     ftpAction("get", true, null, 3) {
       ant.fileset(dir: artifactsPath) {
         include(name: "${sitFileName}.sit")
diff --git a/build/mac/signapp_ce.sh b/build/mac/signapp_ce.sh
index e95b1077ec4e..5be7138f2e7f 100644
--- a/build/mac/signapp_ce.sh
+++ b/build/mac/signapp_ce.sh
@@ -16,8 +16,8 @@ unzip -q $1.sit -d ~/${EXPLODED}/
 rm $1.sit
 BUILD_NAME=$(ls ~/${EXPLODED}/)
 
-if [ $# -eq 6 ] && [ -f ~/"${6##*[/|\\]}" ]; then
-  archiveJDK="${6##*[/|\\]}"
+if [ $# -eq 6 ] && [ -f $6 ]; then
+  archiveJDK="$6"
   echo "Modifying Info.plist"
   sed -i -e 's/1.6\*/1.6\+/' ~/${EXPLODED}/"$BUILD_NAME"/Contents/Info.plist
   jdk=jdk-bundled