diff --git a/scripts/build.sh b/scripts/build.sh
index b2e3248e4..dcd9bd7c8 100755
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -42,18 +42,10 @@ gox \
     -os="${XC_OS}" \
     -arch="${XC_ARCH}" \
     -ldflags "-X main.GitCommit ${GIT_COMMIT}${GIT_DIRTY}" \
-    -output "pkg/{{.OS}}_{{.Arch}}/packer-{{.Dir}}" \
-    ./...
+    -output "pkg/{{.OS}}_{{.Arch}}/packer" \
+    .
 set -e
 
-# Make sure "packer-packer" is renamed properly
-for PLATFORM in $(find ./pkg -mindepth 1 -maxdepth 1 -type d); do
-    set +e
-    mv ${PLATFORM}/packer-packer.exe ${PLATFORM}/packer.exe 2>/dev/null
-    mv ${PLATFORM}/packer-packer ${PLATFORM}/packer 2>/dev/null
-    set -e
-done
-
 # Move all the compiled things to the $GOPATH/bin
 GOPATH=${GOPATH:-$(go env GOPATH)}
 case $(uname) in