diff --git a/scripts/build.sh b/scripts/build.sh
index 0da1ce305..10c28fa7e 100755
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -23,7 +23,7 @@ fi
 
 # Determine the arch/os combos we're building for
 XC_ARCH=${XC_ARCH:-"386 amd64 arm"}
-XC_OS=${XC_OS:-linux darwin windows freebsd openbsd}
+XC_OS=${XC_OS:-linux darwin windows}
 
 # Install dependencies
 echo "==> Getting dependencies..."
diff --git a/website/config.rb b/website/config.rb
index e51b909a3..5d77fc11e 100644
--- a/website/config.rb
+++ b/website/config.rb
@@ -17,7 +17,7 @@ if !ENV["PACKER_DISABLE_DOWNLOAD_FETCH"]
   response = http.request(req)
 
   response.body.split("\n").each do |line|
-    next if line !~ /\/mitchellh\/packer\/(#{Regexp.quote(ENV["PACKER_VERSION"])}.+?)'/
+    next if line !~ /\/mitchellh\/packer\/packer_(#{Regexp.quote(ENV["PACKER_VERSION"])}.+?)'/
     filename = $1.to_s
     os = filename.split("_")[1]
     next if os == "SHA256SUMS"
@@ -84,7 +84,7 @@ helpers do
   end
 
   def download_url(file)
-    "https://dl.bintray.com/mitchellh/packer/#{file}"
+    "https://dl.bintray.com/mitchellh/packer/packer_#{file}"
   end
 
   def latest_version
diff --git a/website/source/downloads.html.erb b/website/source/downloads.html.erb
index 38465d300..36f18d710 100644
--- a/website/source/downloads.html.erb
+++ b/website/source/downloads.html.erb
@@ -17,7 +17,7 @@ page_title: "Downloads"
 			Below are all available downloads for the latest version of Packer
 			(<%= latest_version %>). Please download the proper package for your
 			operating system and architecture. You can find SHA256 checksums
-			for packages <a href="https://dl.bintray.com/mitchellh/packer/<%= latest_version %>_SHA256SUMS?direct">here</a>.
+			for packages <a href="https://dl.bintray.com/mitchellh/packer/packer_<%= latest_version %>_SHA256SUMS?direct">here</a>.
 			</p>
 		</div>
 	</div>