diff --git a/.goxc.json b/.goxc.json
index f2860d0..90a8109 100644
--- a/.goxc.json
+++ b/.goxc.json
@@ -2,9 +2,10 @@
 	"TasksExclude": [
 		"pkg-build"
 	],
+	"Arch": "amd64",
 	"Os": "darwin freebsd linux windows",
 	"Resources": {
-		"Include": "README*,LICENSE*,bin,etc,themes"
+		"Include": "README*,LICENSE*,inbucket.bat,etc,themes"
 	},
 	"PackageVersion": "20131013",
 	"PrereleaseInfo": "snapshot",
diff --git a/bin/dist-unix.sh b/bin/dist-unix.sh
deleted file mode 100755
index e62e389..0000000
--- a/bin/dist-unix.sh
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/sh
-# Compile and package inbucket dist for unix
-
-if [ "${1}x" = "x" ]; then
-  echo "Usage: $0 <version-label>" 1>&2
-  exit 1
-fi
-label="$1"
-
-# Bail on error
-set -e
-
-# For OS X
-if [ -x /usr/bin/gnutar ]; then
-  tar=/usr/bin/gnutar
-else
-  tar=tar
-fi
-
-# Work directory
-tmpdir=/tmp/inbucket-dist.$$
-mkdir -p $tmpdir
-
-# Figure out our build env/target
-go env > $tmpdir/env
-. $tmpdir/env
-distname="inbucket-${label}-${GOOS}_$GOARCH"
-distdir="$tmpdir/$distname"
-
-echo "Building $distname..."
-mkdir -p $distdir
-go build -o $distdir/inbucket -a -v github.com/jhillyerd/inbucket
-
-echo "Copying resources..."
-cp LICENSE README.md $distdir/
-cp -r etc $distdir/etc
-cp -r themes $distdir/themes
-
-echo "Tarballing..."
-tarball="$HOME/$distname.tbz2"
-cd $tmpdir
-$tar --owner=root --group=0 -cjvf $tarball $distname
-
-echo "Cleaning up..."
-if [ "$tmpdir" != "/" ]; then
-  rm -rf $tmpdir
-fi
-
-echo "Created $tarball"
diff --git a/bin/dist-win.ps1 b/bin/dist-win.ps1
deleted file mode 100644
index 4907b0b..0000000
Binary files a/bin/dist-win.ps1 and /dev/null differ
diff --git a/bin/mailbox-list.sh b/etc/mailbox-list.sh
similarity index 100%
rename from bin/mailbox-list.sh
rename to etc/mailbox-list.sh
diff --git a/bin/message-delete.sh b/etc/message-delete.sh
similarity index 100%
rename from bin/message-delete.sh
rename to etc/message-delete.sh
diff --git a/bin/message-source.sh b/etc/message-source.sh
similarity index 100%
rename from bin/message-source.sh
rename to etc/message-source.sh
diff --git a/bin/inbucket.bat b/inbucket.bat
similarity index 100%
rename from bin/inbucket.bat
rename to inbucket.bat