diff --git a/scripts/build/build-all.sh b/scripts/build/build-all.sh
index e8b2dc9089d..8996cc98f46 100755
--- a/scripts/build/build-all.sh
+++ b/scripts/build/build-all.sh
@@ -115,6 +115,9 @@ if [ -d '/tmp/phantomjs/windows' ]; then
 else
     echo 'PhantomJS binaries for Windows missing!'
 fi
+
+cp /usr/local/go/lib/time/zoneinfo.zip tools/zoneinfo.zip
 go run build.go -goos windows -pkg-arch amd64 ${OPT} package-only
+rm tools/zoneinfo.zip
 
 go run build.go latest
diff --git a/scripts/grunt/release_task.js b/scripts/grunt/release_task.js
index 9f26affcf69..d2b2a8fa2d4 100644
--- a/scripts/grunt/release_task.js
+++ b/scripts/grunt/release_task.js
@@ -33,7 +33,7 @@ module.exports = function(grunt) {
     });
     grunt.config('copy.backend_files', {
       expand: true,
-      src: ['conf/**', 'tools/phantomjs/*', 'scripts/*'],
+      src: ['conf/**', 'tools/**', 'scripts/*'],
       options: { mode: true},
       dest: '<%= tempDir %>'
     });