diff --git a/build.sh b/build.sh
index 671bfc1..c127c15 100755
--- a/build.sh
+++ b/build.sh
@@ -2,10 +2,13 @@
 
 set -e
 cd "$(dirname $0)"
-mkdir -p bin
-for d in $(find cmd -mindepth 1 -maxdepth 1 -type d); do
-	cd $d
-	xn="$(basename "$d")"
-	go build
-	/bin/mv "$xn" ../../bin
-done
+for arch in 386 amd64; do
+	mkdir -p bin/$arch
+	for d in $(find cmd -mindepth 1 -maxdepth 1 -type d); do
+		pushd $d >/dev/null
+		xn="$(basename "$d")"
+		GOARCH=$arch go build
+		/bin/mv "$xn" ../../bin/$arch
+		popd >/dev/null
+	done
+done
\ No newline at end of file