diff --git a/scripts/dist.sh b/scripts/dist.sh
index 4127a66c2..bebac51f1 100755
--- a/scripts/dist.sh
+++ b/scripts/dist.sh
@@ -16,6 +16,13 @@ DIR="$( cd -P "$( dirname "$SOURCE" )/.." && pwd )"
 # Change into that dir because we expect that
 cd $DIR
 
+# Generate the tag.
+if [ -z $NOTAG ]; then
+  echo "==> Tagging..."
+  git commit --allow-empty -a --gpg-sign=348FFC4C -m "Release v$VERSION"
+  git tag -a -m "Version $VERSION" -s -u 348FFC4C "v${VERSION}" master
+fi
+
 # Zip all the files
 rm -rf ./pkg/dist
 mkdir -p ./pkg/dist
@@ -32,3 +39,14 @@ if [ -z $NOSIGN ]; then
   gpg --default-key 348FFC4C --detach-sig ./nomad_${VERSION}_SHA256SUMS
 fi
 popd
+
+# Upload
+if [ ! -z $HC_RELEASE ]; then
+  hc-releases -upload $DIR/pkg/dist --publish --purge
+
+  curl -X PURGE https://releases.hashicorp.com/nomad/${VERSION}
+  for FILENAME in $(find $DIR/pkg/dist -type f); do
+    FILENAME=$(basename $FILENAME)
+    curl -X PURGE https://releases.hashicorp.com/nomad/${VERSION}/${FILENAME}
+  done
+fi