diff --git a/.travis/git-deploy b/.travis/git-deploy
index 35c46cba9f..5ecd667cac 100755
--- a/.travis/git-deploy
+++ b/.travis/git-deploy
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # Don't display the commands executed.
-set -e +x
+set -eu +x
 
 if [ -z "$GIT_TOKEN" ]; then
   exit 0
@@ -56,7 +56,7 @@ case $ENV in
   windows)
     # Windows: make a zip archive.
     mv _install/bin/qtox.exe .
-    zip $DEPLOY_DIR/qtox.zip qtox.exe
+    zip $DEPLOY_DIR/qtox-$ARCH.zip qtox.exe
     ;;
   *)
     echo "Unknown ENV: '$ENV'"
diff --git a/.travis/test-after_script b/.travis/test-after_script
index be3a60873f..424416b772 100755
--- a/.travis/test-after_script
+++ b/.travis/test-after_script
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-GENERATED='_build/(moc_|qrc_|ui_).*'
+GENERATED='.*/(moc_|qrc_|ui_).*'
 
 coveralls                        \
   --exclude test                 \
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 787f30aed3..e228072422 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -15,13 +15,17 @@ set(ENV{PKG_CONFIG_PATH}
   ${CMAKE_SOURCE_DIR}/libs/lib/pkgconfig:/opt/ffmpeg/lib/pkgconfig:$ENV{PKG_CONFIG_PATH})
 set(ENV{PKG_CONFIG_PATH_i686_w64_mingw32_shared}
   ${CMAKE_SOURCE_DIR}/libs/lib/pkgconfig)
+set(ENV{PKG_CONFIG_PATH_x86_64_w64_mingw32_shared}
+  ${CMAKE_SOURCE_DIR}/libs/lib/pkgconfig)
 
 execute_process(
   COMMAND brew --prefix qt5
   OUTPUT_VARIABLE QT_PREFIX_PATH
   OUTPUT_STRIP_TRAILING_WHITESPACE)
 if(NOT QT_PREFIX_PATH)
-  set(QT_PREFIX_PATH /usr/src/mxe/usr/i686-w64-mingw32.shared/qt5)
+  set(QT_PREFIX_PATH
+    /usr/src/mxe/usr/x86_64-w64-mingw32.shared/qt5
+    /usr/src/mxe/usr/i686-w64-mingw32.shared/qt5)
 endif()
 
 set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} ${QT_PREFIX_PATH})