diff --git a/scripts/dist.sh b/scripts/dist.sh
index c4f0551101..f1a64ecce3 100755
--- a/scripts/dist.sh
+++ b/scripts/dist.sh
@@ -9,7 +9,7 @@ if [ -z $VERSION ]; then
 fi
 
 # Make sure we have a bintray API key
-if [ -z $BINTRAY_API_KEY ]; then
+if [ -z $BINTRAY_API_KEY ] && [ ! -z $NOBINTRAY ]; then
     echo "Please set your bintray API key in the BINTRAY_API_KEY env var."
     exit 1
 fi
@@ -22,6 +22,19 @@ DIR="$( cd -P "$( dirname "$SOURCE" )/.." && pwd )"
 # Change into that dir because we expect that
 cd $DIR
 
+# Tag, unless told not to
+if [ -z $NOTAG ]; then
+  echo "==> Tagging..."
+  git commit --allow-empty -a --gpg-sign=348FFC4C -m "Cut version $VERSION"
+  git tag -a -m "Version $VERSION" -s -u 348FFC4C "v${VERSION}" master
+fi
+
+# Build the packages
+if [ -z $NOBUILD ]; then
+# Yes, jefferai/gox should be parameterized; it's just a local build of the Dockerfile in the cross dir
+  docker run --rm -v "$(pwd)":/gopath/src/github.com/hashicorp/vault -w /gopath/src/github.com/hashicorp/vault jefferai/gox:1.5.1
+fi
+
 # Zip all the files
 rm -rf ./pkg/dist
 mkdir -p ./pkg/dist
@@ -30,15 +43,18 @@ for FILENAME in $(find ./pkg -mindepth 1 -maxdepth 1 -type f); do
     cp ./pkg/${FILENAME} ./pkg/dist/vault_${VERSION}_${FILENAME}
 done
 
-# Make the checksums
-pushd ./pkg/dist
-rm -f ./vault_${VERSION}_SHA256SUMS*
-shasum -a256 * > ./vault_${VERSION}_SHA256SUMS
-gpg --default-key 348FFC4C --detach-sig ./vault_${VERSION}_SHA256SUMS
-popd
+if [ -z $NOSIGN ]; then
+  echo "==> Signing..."
+  pushd ./pkg/dist
+  rm -f ./vault_${VERSION}_SHA256SUMS*
+  shasum -a256 * > ./vault_${VERSION}_SHA256SUMS
+  gpg --default-key 348FFC4C --detach-sig ./vault_${VERSION}_SHA256SUMS
+  popd
+fi
 
 # Upload
-for ARCHIVE in ./pkg/dist/*; do
+if [ ! -z $NOBINTRAY ]; then
+  for ARCHIVE in ./pkg/dist/*; do
     ARCHIVE_NAME=$(basename ${ARCHIVE})
 
     echo Uploading: $ARCHIVE_NAME
@@ -46,6 +62,7 @@ for ARCHIVE in ./pkg/dist/*; do
         -T ${ARCHIVE} \
         -umitchellh:${BINTRAY_API_KEY} \
         "https://api.bintray.com/content/mitchellh/vault/vault/${VERSION}/${ARCHIVE_NAME}"
-done
+  done
+fi
 
 exit 0