diff --git a/make_package.py b/make_package.py
index 0062aa3..9c6f2de 100755
--- a/make_package.py
+++ b/make_package.py
@@ -25,6 +25,7 @@ args = parser.parse_args()
 common.workspace_dir = utils.get_abspath(utils.get_script_dir(__file__) + "/..")
 common.os_family = utils.host_platform()
 common.platform = args.platform
+common.prefix = common.platforms[common.platform]["prefix"]
 common.targets = args.targets
 common.clean = "clean" in args.targets
 common.sign = "sign" in args.targets
@@ -39,6 +40,7 @@ common.deploy_data = []
 utils.log("workspace_dir: " + common.workspace_dir)
 utils.log("os_family:     " + common.os_family)
 utils.log("platform:      " + str(common.platform))
+utils.log("prefix:        " + str(common.prefix))
 utils.log("targets:       " + str(common.targets))
 utils.log("clean:         " + str(common.clean))
 utils.log("sign:          " + str(common.sign))
diff --git a/scripts/package_desktop.py b/scripts/package_desktop.py
index e2e125d..65c70bf 100644
--- a/scripts/package_desktop.py
+++ b/scripts/package_desktop.py
@@ -84,8 +84,8 @@ def make_windows():
     utils.delete_files("update\\*.html")
 
   utils.log_h2("copy arifacts")
-  source_dir = "%s\\build_tools\\out\\%s\\%s" % (common.workspace_dir, \
-    common.platforms[common.platform]["prefix"], branding.company_name)
+  source_dir = "%s\\build_tools\\out\\%s\\%s" \
+    % (common.workspace_dir, common.prefix, branding.company_name)
   utils.create_dir("build")
   desktop_dir = "build\\" + branding.desktop_product_name_s
   utils.copy_dir(source_dir + "\\" + branding.desktop_product_name_s, desktop_dir)
@@ -406,6 +406,13 @@ def make_macos():
     utils.delete_dir(utils.get_env("HOME") + "/Library/Developer/Xcode/Archives")
     utils.delete_dir(utils.get_env("HOME") + "/Library/Caches/Sparkle_generate_appcast")
 
+  source_dir = "%s/build_tools/out/%s/%s" \
+    % (common.workspace_dir, common.prefix, branding.company_name)
+  if branding.onlyoffice:
+    for path in utils.glob_path(source_dir \
+        + "/desktopeditors/editors/web-apps/apps/*/main/resources/help"):
+      utils.delete_dir(path)
+
   appcast_url = branding.sparkle_base_url + "/" + suffix + "/" + branding.desktop_package_name.lower() + ".xml"
   release_bundle_version_string = utils.sh_output(
     'curl -Ls ' + appcast_url + ' 2> /dev/null' \
@@ -559,7 +566,7 @@ def make_linux():
       utils.log_h2("desktop tar deploy")
       if "tar" in branding.desktop_make_targets:
         ret = aws_s3_upload(
-            utils.glob_path("tar/*.tar.gz") + utils.glob_path("tar/*.tar.xz"),
+            utils.glob_path("tar/*.tar*"),
             "linux/generic/", "Portable"
         )
         utils.set_summary("desktop tar deploy", ret)