diff --git a/scripts/dist.sh b/scripts/dist.sh
index 0f368de9..c144c7fd 100755
--- a/scripts/dist.sh
+++ b/scripts/dist.sh
@@ -19,12 +19,10 @@ 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 -m "Release v$VERSION"
-#  git tag -a -m "Version $VERSION" "v${VERSION}" master
-#fi
+# Delete the old dir
+echo "==> Removing old directory..."
+rm -rf build/pkg
+mkdir -p build/pkg
 
 # Do a hermetic build inside a Docker container.
 docker build -t tendermint/tendermint-builder scripts/tendermint-builder/
diff --git a/scripts/dist_build.sh b/scripts/dist_build.sh
index f75faee5..3e6d5abc 100755
--- a/scripts/dist_build.sh
+++ b/scripts/dist_build.sh
@@ -18,11 +18,6 @@ GIT_IMPORT="github.com/tendermint/tendermint/version"
 XC_ARCH=${XC_ARCH:-"386 amd64 arm"}
 XC_OS=${XC_OS:-"solaris darwin freebsd linux windows"}
 
-# Delete the old dir
-echo "==> Removing old directory..."
-rm -rf build/pkg
-mkdir -p build/pkg
-
 # Make sure build tools are available.
 make tools
 
diff --git a/scripts/publish.sh b/scripts/publish.sh
index e87fea0d..3091575f 100755
--- a/scripts/publish.sh
+++ b/scripts/publish.sh
@@ -1,8 +1,8 @@
 #!/usr/bin/env bash
-set -eu
+set -e
 
 VERSION=$1 
-DIST_DIR=$2 # ./build/dist
+DIST_DIR=./build/dist
 
 # Get the version from the environment, or try to figure it out.
 if [ -z $VERSION ]; then
@@ -14,7 +14,6 @@ if [ -z "$VERSION" ]; then
 fi
 
 # copy to s3
-aws s3 cp --recursive ${DIST_DIR} s3://tendermint/${VERSION} --acl public-read --exclude "*" --include "*.zip" 
-aws s3 cp ${DIST_DIR}/tendermint_${VERSION}_SHA256SUMS s3://tendermint/0.9.0 --acl public-read 
+aws s3 cp --recursive ${DIST_DIR} s3://tendermint/binaries/tendermint/v${VERSION} --acl public-read 
 
 exit 0