diff --git a/Makefile b/Makefile
index a28e041f..ad591a9e 100644
--- a/Makefile
+++ b/Makefile
@@ -347,7 +347,7 @@ $(BUILD_OUTPUT_DIRECTORY)/$(APPLICATION_NAME)-$(APPLICATION_VERSION)-darwin-$(TA
 ifdef CODE_SIGN_IDENTITY
 	./scripts/build/electron-sign-app-darwin.sh -a $</$(APPLICATION_NAME).app -i "$(CODE_SIGN_IDENTITY)"
 endif
-	./scripts/build/electron-installer-app-zip-darwin.sh -a $</$(APPLICATION_NAME).app -o $@
+	./scripts/build/zip-file.sh -f $</$(APPLICATION_NAME).app -s $(TARGET_PLATFORM) -o $@
 
 $(BUILD_OUTPUT_DIRECTORY)/$(APPLICATION_NAME)-$(APPLICATION_VERSION)-darwin-$(TARGET_ARCH).dmg: \
 	$(BUILD_DIRECTORY)/$(APPLICATION_NAME)-$(APPLICATION_VERSION)-$(TARGET_PLATFORM)-$(TARGET_ARCH)-rw.dmg \
@@ -380,7 +380,7 @@ $(BUILD_DIRECTORY)/$(APPLICATION_NAME)-$(APPLICATION_VERSION)-linux-$(TARGET_ARC
 $(BUILD_OUTPUT_DIRECTORY)/$(APPLICATION_NAME)-$(APPLICATION_VERSION)-linux-$(TARGET_ARCH).zip: \
 	$(BUILD_DIRECTORY)/$(APPLICATION_NAME)-$(APPLICATION_VERSION)-linux-$(TARGET_ARCH).AppImage \
 	| $(BUILD_OUTPUT_DIRECTORY)
-	./scripts/build/electron-installer-appimage-zip.sh -i $< -o $@
+	./scripts/build/zip-file.sh -f $< -s $(TARGET_PLATFORM) -o $@
 
 $(BUILD_OUTPUT_DIRECTORY)/$(APPLICATION_NAME_LOWERCASE)-electron_$(APPLICATION_VERSION_DEBIAN)_$(TARGET_ARCH_DEBIAN).deb: \
 	$(BUILD_DIRECTORY)/$(APPLICATION_NAME)-$(APPLICATION_VERSION)-linux-$(TARGET_ARCH) \
@@ -391,7 +391,7 @@ $(BUILD_OUTPUT_DIRECTORY)/$(APPLICATION_NAME_LOWERCASE)-electron_$(APPLICATION_V
 $(BUILD_OUTPUT_DIRECTORY)/$(APPLICATION_NAME)-$(APPLICATION_VERSION)-win32-$(TARGET_ARCH).zip: \
 	$(BUILD_DIRECTORY)/$(APPLICATION_NAME)-$(APPLICATION_VERSION)-win32-$(TARGET_ARCH) \
 	| $(BUILD_OUTPUT_DIRECTORY)
-	./scripts/build/electron-installer-zip-win32.sh -a $< -o $@
+	./scripts/build/zip-file.sh -f $< -s $(TARGET_PLATFORM) -o $@
 
 $(BUILD_OUTPUT_DIRECTORY)/$(APPLICATION_NAME)-$(APPLICATION_VERSION)-win32-$(TARGET_ARCH).exe: \
 	$(BUILD_DIRECTORY)/$(APPLICATION_NAME)-$(APPLICATION_VERSION)-win32-$(TARGET_ARCH) \
@@ -407,6 +407,16 @@ ifdef CODE_SIGN_CERTIFICATE_PASSWORD
 endif
 endif
 
+$(BUILD_OUTPUT_DIRECTORY)/$(APPLICATION_NAME)-cli-$(APPLICATION_VERSION)-$(TARGET_PLATFORM)-$(TARGET_ARCH).zip: \
+	$(BUILD_DIRECTORY)/$(APPLICATION_NAME)-cli-$(APPLICATION_VERSION)-$(TARGET_PLATFORM)-$(TARGET_ARCH) \
+	| $(BUILD_OUTPUT_DIRECTORY)
+	./scripts/build/zip-file.sh -f $< -s $(TARGET_PLATFORM) -o $@
+
+$(BUILD_OUTPUT_DIRECTORY)/$(APPLICATION_NAME)-cli-$(APPLICATION_VERSION)-$(TARGET_PLATFORM)-$(TARGET_ARCH).tar.gz: \
+	$(BUILD_DIRECTORY)/$(APPLICATION_NAME)-cli-$(APPLICATION_VERSION)-$(TARGET_PLATFORM)-$(TARGET_ARCH) \
+	| $(BUILD_OUTPUT_DIRECTORY)
+	./scripts/build/tar-gz-file.sh -f $< -o $@
+
 # ---------------------------------------------------------------------
 # Phony targets
 # ---------------------------------------------------------------------
@@ -428,22 +438,28 @@ package-cli: $(BUILD_DIRECTORY)/$(APPLICATION_NAME)-cli-$(APPLICATION_VERSION)-$
 ifeq ($(TARGET_PLATFORM),darwin)
 electron-installer-app-zip: $(BUILD_OUTPUT_DIRECTORY)/$(APPLICATION_NAME)-$(APPLICATION_VERSION)-$(TARGET_PLATFORM)-$(TARGET_ARCH).zip
 electron-installer-dmg: $(BUILD_OUTPUT_DIRECTORY)/$(APPLICATION_NAME)-$(APPLICATION_VERSION)-$(TARGET_PLATFORM)-$(TARGET_ARCH).dmg
+cli-installer-tar-gz: $(BUILD_OUTPUT_DIRECTORY)/$(APPLICATION_NAME)-cli-$(APPLICATION_VERSION)-$(TARGET_PLATFORM)-$(TARGET_ARCH).tar.gz
 TARGETS += \
 	electron-installer-dmg \
-	electron-installer-app-zip
+	electron-installer-app-zip \
+	cli-installer-tar-gz
 PUBLISH_AWS_S3 += \
 	$(BUILD_OUTPUT_DIRECTORY)/$(APPLICATION_NAME)-$(APPLICATION_VERSION)-$(TARGET_PLATFORM)-$(TARGET_ARCH).zip \
-	$(BUILD_OUTPUT_DIRECTORY)/$(APPLICATION_NAME)-$(APPLICATION_VERSION)-$(TARGET_PLATFORM)-$(TARGET_ARCH).dmg
+	$(BUILD_OUTPUT_DIRECTORY)/$(APPLICATION_NAME)-$(APPLICATION_VERSION)-$(TARGET_PLATFORM)-$(TARGET_ARCH).dmg \
+	$(BUILD_OUTPUT_DIRECTORY)/$(APPLICATION_NAME)-cli-$(APPLICATION_VERSION)-$(TARGET_PLATFORM)-$(TARGET_ARCH).tar.gz
 endif
 
 ifeq ($(TARGET_PLATFORM),linux)
 electron-installer-appimage: $(BUILD_OUTPUT_DIRECTORY)/$(APPLICATION_NAME)-$(APPLICATION_VERSION)-$(TARGET_PLATFORM)-$(TARGET_ARCH).zip
 electron-installer-debian: $(BUILD_OUTPUT_DIRECTORY)/$(APPLICATION_NAME_LOWERCASE)-electron_$(APPLICATION_VERSION_DEBIAN)_$(TARGET_ARCH_DEBIAN).deb
+cli-installer-tar-gz: $(BUILD_OUTPUT_DIRECTORY)/$(APPLICATION_NAME)-cli-$(APPLICATION_VERSION)-$(TARGET_PLATFORM)-$(TARGET_ARCH).tar.gz
 TARGETS +=  \
 	electron-installer-appimage \
-	electron-installer-debian
+	electron-installer-debian \
+	cli-installer-tar-gz
 PUBLISH_AWS_S3 += \
-	$(BUILD_OUTPUT_DIRECTORY)/$(APPLICATION_NAME)-$(APPLICATION_VERSION)-$(TARGET_PLATFORM)-$(TARGET_ARCH).zip
+	$(BUILD_OUTPUT_DIRECTORY)/$(APPLICATION_NAME)-$(APPLICATION_VERSION)-$(TARGET_PLATFORM)-$(TARGET_ARCH).zip \
+	$(BUILD_OUTPUT_DIRECTORY)/$(APPLICATION_NAME)-cli-$(APPLICATION_VERSION)-$(TARGET_PLATFORM)-$(TARGET_ARCH).tar.gz
 PUBLISH_BINTRAY_DEBIAN += \
 	$(BUILD_OUTPUT_DIRECTORY)/$(APPLICATION_NAME_LOWERCASE)-electron_$(APPLICATION_VERSION_DEBIAN)_$(TARGET_ARCH_DEBIAN).deb
 endif
@@ -451,12 +467,15 @@ endif
 ifeq ($(TARGET_PLATFORM),win32)
 electron-installer-zip: $(BUILD_OUTPUT_DIRECTORY)/$(APPLICATION_NAME)-$(APPLICATION_VERSION)-$(TARGET_PLATFORM)-$(TARGET_ARCH).zip
 electron-installer-nsis: $(BUILD_OUTPUT_DIRECTORY)/$(APPLICATION_NAME)-$(APPLICATION_VERSION)-win32-$(TARGET_ARCH).exe
+cli-installer-zip: $(BUILD_OUTPUT_DIRECTORY)/$(APPLICATION_NAME)-cli-$(APPLICATION_VERSION)-$(TARGET_PLATFORM)-$(TARGET_ARCH).zip
 TARGETS += \
 	electron-installer-zip \
-	electron-installer-nsis
+	electron-installer-nsis \
+	cli-installer-zip
 PUBLISH_AWS_S3 += \
 	$(BUILD_OUTPUT_DIRECTORY)/$(APPLICATION_NAME)-$(APPLICATION_VERSION)-$(TARGET_PLATFORM)-$(TARGET_ARCH).zip \
-	$(BUILD_OUTPUT_DIRECTORY)/$(APPLICATION_NAME)-$(APPLICATION_VERSION)-win32-$(TARGET_ARCH).exe
+	$(BUILD_OUTPUT_DIRECTORY)/$(APPLICATION_NAME)-$(APPLICATION_VERSION)-win32-$(TARGET_ARCH).exe \
+	$(BUILD_OUTPUT_DIRECTORY)/$(APPLICATION_NAME)-cli-$(APPLICATION_VERSION)-$(TARGET_PLATFORM)-$(TARGET_ARCH).zip
 endif
 
 ifdef PUBLISH_AWS_S3
diff --git a/scripts/build/electron-installer-appimage-zip.sh b/scripts/build/electron-installer-appimage-zip.sh
deleted file mode 100755
index 9d8f7fd2..00000000
--- a/scripts/build/electron-installer-appimage-zip.sh
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/bin/bash
-
-###
-# Copyright 2016 resin.io
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-###
-
-set -u
-set -e
-
-./scripts/build/check-dependency.sh zip
-
-function usage() {
-  echo "Usage: $0"
-  echo ""
-  echo "Options"
-  echo ""
-  echo "    -i <appimage>"
-  echo "    -o <output>"
-  exit 1
-}
-
-ARGV_APPIMAGE=""
-ARGV_OUTPUT=""
-
-while getopts ":i:o:" option; do
-  case $option in
-    i) ARGV_APPIMAGE="$OPTARG" ;;
-    o) ARGV_OUTPUT="$OPTARG" ;;
-    *) usage ;;
-  esac
-done
-
-if [ -z "$ARGV_APPIMAGE" ] || [ -z "$ARGV_OUTPUT" ]; then
-  usage
-fi
-
-# Package AppImage inside a Zip to preserve the execution permissions
-CWD=$(pwd)
-mkdir -p "$(dirname $ARGV_OUTPUT)"
-pushd "$(dirname $ARGV_APPIMAGE)"
-zip "$CWD/$ARGV_OUTPUT" "$(basename $ARGV_APPIMAGE)"
-popd
diff --git a/scripts/build/electron-installer-zip-win32.sh b/scripts/build/tar-gz-file.sh
similarity index 73%
rename from scripts/build/electron-installer-zip-win32.sh
rename to scripts/build/tar-gz-file.sh
index 60fadbda..39efee90 100755
--- a/scripts/build/electron-installer-zip-win32.sh
+++ b/scripts/build/tar-gz-file.sh
@@ -19,34 +19,34 @@
 set -u
 set -e
 
-./scripts/build/check-dependency.sh zip
+./scripts/build/check-dependency.sh tar
 
 function usage() {
   echo "Usage: $0"
   echo ""
   echo "Options"
   echo ""
-  echo "    -a <application package directory>"
+  echo "    -f <file>"
   echo "    -o <output>"
   exit 1
 }
 
-ARGV_APPLICATION=""
+ARGV_FILE=""
 ARGV_OUTPUT=""
 
-while getopts ":a:o:" option; do
+while getopts ":f:o:" option; do
   case $option in
-    a) ARGV_APPLICATION="$OPTARG" ;;
+    f) ARGV_FILE="$OPTARG" ;;
     o) ARGV_OUTPUT="$OPTARG" ;;
     *) usage ;;
   esac
 done
 
-if [ -z "$ARGV_APPLICATION" ] || [ -z "$ARGV_OUTPUT" ]; then
+if [ -z "$ARGV_FILE" ] || [ -z "$ARGV_OUTPUT" ]; then
   usage
 fi
 
 CWD=$(pwd)
-pushd "$ARGV_APPLICATION"
-zip -r -9 "$CWD/$ARGV_OUTPUT" *
+pushd "$(dirname "$ARGV_FILE")"
+tar -czvf "$CWD/$ARGV_OUTPUT" "$(basename "$ARGV_FILE")"
 popd
diff --git a/scripts/build/electron-installer-app-zip-darwin.sh b/scripts/build/zip-file.sh
similarity index 54%
rename from scripts/build/electron-installer-app-zip-darwin.sh
rename to scripts/build/zip-file.sh
index 31218407..e4284a57 100755
--- a/scripts/build/electron-installer-app-zip-darwin.sh
+++ b/scripts/build/zip-file.sh
@@ -19,12 +19,6 @@
 set -u
 set -e
 
-OS=$(uname)
-if [[ "$OS" != "Darwin" ]]; then
-  echo "This script is only meant to be run in OS X" 1>&2
-  exit 1
-fi
-
 ./scripts/build/check-dependency.sh zip
 
 function usage() {
@@ -32,27 +26,44 @@ function usage() {
   echo ""
   echo "Options"
   echo ""
-  echo "    -a <application (.app)>"
+  echo "    -f <file>"
+  echo "    -s <operating system>"
   echo "    -o <output>"
   exit 1
 }
 
-ARGV_APPLICATION=""
+ARGV_FILE=""
 ARGV_OUTPUT=""
 
-while getopts ":a:o:" option; do
+while getopts ":f:s:o:" option; do
   case $option in
-    a) ARGV_APPLICATION="$OPTARG" ;;
+    f) ARGV_FILE="$OPTARG" ;;
+    s) ARGV_OPERATING_SYSTEM="$OPTARG" ;;
     o) ARGV_OUTPUT="$OPTARG" ;;
     *) usage ;;
   esac
 done
 
-if [ -z "$ARGV_APPLICATION" ] || [ -z "$ARGV_OUTPUT" ]; then
+if [ -z "$ARGV_FILE" ] ||
+   [ -z "$ARGV_OPERATING_SYSTEM" ] ||
+   [ -z "$ARGV_OUTPUT" ]; then
   usage
 fi
 
 CWD=$(pwd)
-pushd "$(dirname "$ARGV_APPLICATION")"
-zip -r -9 "$CWD/$ARGV_OUTPUT" "$(basename "$ARGV_APPLICATION")"
+
+# The default unzip tool in Windows already creates a base directory
+# whose name equals the zip file name excluding the extension, therefore
+# the common practice for zipping directories in this platform is to
+# zip their contents instead.
+if [ "$ARGV_OPERATING_SYSTEM" == "win32" ] && [ -d "$ARGV_FILE" ]; then
+  pushd "$ARGV_FILE"
+  zip -r -9 "$CWD/$ARGV_OUTPUT" *
+
+else
+  pushd "$(dirname "$ARGV_FILE")"
+  zip -r -9 "$CWD/$ARGV_OUTPUT" "$(basename "$ARGV_FILE")"
+fi
+
 popd
+