diff --git a/bin/breezy_gnome_setup b/bin/breezy_gnome_setup
index c3714cd..eff137e 100755
--- a/bin/breezy_gnome_setup
+++ b/bin/breezy_gnome_setup
@@ -13,6 +13,10 @@ fi
 
 start_dir=$(pwd)
 
+
+ARCH=$(uname -m)
+echo "Building for $ARCH"
+
 # create temp directory
 tmp_dir=$(mktemp -d -t breezy-gnome-XXXXXXXXXX)
 pushd $tmp_dir > /dev/null
@@ -25,7 +29,7 @@ then
   binary_path_arg="$3"
 elif [ "$1" = "--tag" ] && [ -n "$2" ]
 then
-  binary_download_url="https://github.com/wheaney/breezy-desktop/releases/download/$2/breezyGNOME.tar.gz"
+  binary_download_url="https://github.com/wheaney/breezy-desktop/releases/download/$2/breezyGNOME-$ARCH.tar.gz"
 else
   binary_path_arg="$1"
 fi
@@ -33,8 +37,9 @@ fi
 if [ -z "$binary_path_arg" ]
 then
   # download and unzip the binary
-  echo "Downloading to: ${tmp_dir}/breezyGNOME.tar.gz"
+  echo "Downloading to: ${tmp_dir}/breezyGNOME-$ARCH.tar.gz"
   curl -L -O $binary_download_url
+  binary_path_arg="breezyGNOME-$ARCH.tar.gz"
 else
   if [[ "$binary_path_arg" = /* ]]; then
     abs_path="$binary_path_arg"
@@ -45,16 +50,8 @@ else
   cp $abs_path $tmp_dir
 fi
 
-# if abs_path is present, grab the filename from it
-if [ -n "$abs_path" ]
-then
-  filename=$(basename $abs_path)
-else
-  filename="breezyGNOME.tar.gz"
-fi
-
 echo "Extracting to: ${tmp_dir}/breezy_gnome"
-tar -xf $filename
+tar -xf $(basename $binary_path_arg)
 
 pushd breezy_gnome > /dev/null