diff --git a/Makefile b/Makefile
index 021420b5a..89db1d5b0 100644
--- a/Makefile
+++ b/Makefile
@@ -6,6 +6,17 @@ build: prepare
 		"-X main.Version $(VERSION)" \
 		./cmd/telegraf/telegraf.go
 
+build-linux-bins: prepare
+	GOARCH=amd64 GOOS=linux $(GOPATH)/bin/godep go build -o telegraf_linux_amd64 \
+                     -ldflags "-X main.Version $(VERSION)" \
+                     ./cmd/telegraf/telegraf.go
+	GOARCH=386 GOOS=linux $(GOPATH)/bin/godep go build -o telegraf_linux_386 \
+                     -ldflags "-X main.Version $(VERSION)" \
+                     ./cmd/telegraf/telegraf.go
+	GOARCH=arm GOOS=linux $(GOPATH)/bin/godep go build -o telegraf_linux_arm \
+                     -ldflags "-X main.Version $(VERSION)" \
+                     ./cmd/telegraf/telegraf.go
+
 prepare:
 	go get github.com/tools/godep
 
diff --git a/README.md b/README.md
index c48549889..ff7d772d6 100644
--- a/README.md
+++ b/README.md
@@ -33,6 +33,9 @@ Latest:
 * http://get.influxdb.org/telegraf/telegraf_0.1.8_amd64.deb
 * http://get.influxdb.org/telegraf/telegraf-0.1.8-1.x86_64.rpm
 
+Binaries:
+* http://get.influxdb.org/telegraf/telegraf_0.1.8_linux_x86_64.tar.gz
+
 0.1.4:
 * http://get.influxdb.org/telegraf/telegraf_0.1.4_amd64.deb
 * http://get.influxdb.org/telegraf/telegraf-0.1.4-1.x86_64.rpm
diff --git a/package.sh b/package.sh
index facd09c3b..cea7cdf26 100755
--- a/package.sh
+++ b/package.sh
@@ -303,13 +303,15 @@ if [ "$CIRCLE_BRANCH" == "" ]; then
                 echo "Upload failed -- aborting".
                 cleanup_exit 1
             fi
+            rm $filepath
         done
 
-        # Upload binaries
-        for b in ${BINS[*]}; do
-            zippedbin=${b}_${VERSION}_linux_x86_64.tar.gz
+        # Make and upload linux amd64, 386, and arm
+        make build-linux-bins
+        for b in `ls telegraf_*`; do
+            zippedbin=${b}_${VERSION}.tar.gz
             # Zip the binary
-            tar -zcf $TMP_WORK_DIR/$zippedbin -C $GOPATH_INSTALL/bin ./$b
+            tar -zcf $TMP_WORK_DIR/$zippedbin ./$b
             echo "Uploading binary: $zippedbin to S3"
             AWS_CONFIG_FILE=$AWS_FILE aws s3 cp $TMP_WORK_DIR/$zippedbin \
                 s3://get.influxdb.org/telegraf/$zippedbin \