diff --git a/Dockerfile b/Dockerfile
index 0a5c464bd..5bcef9ab9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 # KeePassXC Linux Release Build Dockerfile
-# Copyright (C) 2017 KeePassXC team <https://keepassxc.org/>
+# Copyright (C) 2017-2018 KeePassXC team <https://keepassxc.org/>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -19,7 +19,7 @@ FROM ubuntu:14.04
 ENV REBUILD_COUNTER=5
 
 ENV QT5_VERSION=59
-ENV QT5_PPA_VERSION=${QT5_VERSION}2
+ENV QT5_PPA_VERSION=${QT5_VERSION}4
 
 RUN set -x \
     && apt-get update -y \
diff --git a/release-tool b/release-tool
index 08e788e13..0df84e34d 100755
--- a/release-tool
+++ b/release-tool
@@ -645,37 +645,38 @@ build() {
     
     if [ "" == "$DOCKER_IMAGE" ]; then
         if [ "$(uname -s)" == "Darwin" ]; then
-            # Building on OS X
-            local qt_vers="$(ls /usr/local/Cellar/qt5 2> /dev/null | sort -r | head -n1)"
+            # Building on macOS
+            local qt_vers="$(ls /usr/local/Cellar/qt 2> /dev/null | sort -r | head -n1)"
             if [ "" == "$qt_vers" ]; then
-                exitError "Couldn't find Qt5! Please make sure it is available in '/usr/local/Cellar/qt5'."
+                exitError "Couldn't find Qt5! Please make sure it is available in '/usr/local/Cellar/qt'."
             fi
-            export MACOSX_DEPLOYMENT_TARGET=10.7
-            
+
+            export MACOSX_DEPLOYMENT_TARGET=10.10
+
             logInfo "Configuring build..."
-            cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${INSTALL_PREFIX}" \
-                -DCMAKE_OSX_ARCHITECTURES=x86_64 -DWITH_CXX11=OFF \
-                -DCMAKE_PREFIX_PATH="/usr/local/Cellar/qt5/${qt_vers}/lib/cmake" \
-                -DQT_BINARY_DIR="/usr/local/Cellar/qt5/${qt_vers}/bin" $CMAKE_OPTIONS "$SRC_DIR"
-            
+            cmake -DCMAKE_BUILD_TYPE=Release \
+              -DCMAKE_OSX_ARCHITECTURES=x86_64 -DCMAKE_INSTALL_PREFIX="${INSTALL_PREFIX}" \
+              -DCMAKE_PREFIX_PATH="/usr/local/Cellar/qt/${qt_vers}/lib/cmake" \
+              ${CMAKE_OPTIONS} "$SRC_DIR"
+
             logInfo "Compiling and packaging sources..."
-            make $MAKE_OPTIONS package
+            make ${MAKE_OPTIONS} package
             
             mv "./${APP_NAME}-${RELEASE_NAME}.dmg" ../
         elif [ "$(uname -o)" == "Msys" ]; then
-            # Building on Windows with Msys
+            # Building on Windows with Msys2
             logInfo "Configuring build..."
             cmake -DCMAKE_BUILD_TYPE=Release -DWITH_TESTS=Off -G"MSYS Makefiles" \
                 -DCMAKE_INSTALL_PREFIX="${INSTALL_PREFIX}" $CMAKE_OPTIONS "$SRC_DIR"
             
             logInfo "Compiling and packaging sources..."
-            mingw32-make $MAKE_OPTIONS preinstall
+            mingw32-make ${MAKE_OPTIONS} preinstall
             # Call cpack directly instead of calling make package.
             # This is important because we want to build the MSI when making a
             # release.
             cpack -G "NSIS;ZIP;${CPACK_GENERATORS}"
             
-            mv "./${APP_NAME}-${RELEASE_NAME}-"*.* ../
+            mv "./${APP_NAME}-"*.* ../
         else
             mkdir -p "${OUTPUT_DIR}/bin-release"
             
diff --git a/snapcraft.yaml b/snapcraft.yaml
index 81d4ae3b3..146754fca 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -1,5 +1,5 @@
 name: keepassxc
-version: 2.2.4
+version: 2.3.0-beta1
 grade: stable
 summary: Community-driven port of the Windows application “KeePass Password Safe”
 description: |
@@ -16,6 +16,9 @@ apps:
   cli:
     command: keepassxc-cli
     plugs: [gsettings, home, removable-media, raw-usb]
+  proxy:
+    command: keepassxc-proxy
+    plugs: [home]
 
 parts:
   keepassxc:
@@ -26,10 +29,7 @@ parts:
       - -DCMAKE_INSTALL_PREFIX=/usr
       - -DKEEPASSXC_DIST_TYPE=Snap
       - -DWITH_TESTS=OFF
-      - -DWITH_XC_AUTOTYPE=ON
-      - -DWITH_XC_HTTP=ON
-      - -DWITH_XC_YUBIKEY=ON
-      - -DWITH_XC_BROWSER=ON
+      - -DWITH_XC_ALL=ON
     build-packages:
       - g++
       - libgcrypt20-dev
diff --git a/src/zxcvbn/zxcvbn.c b/src/zxcvbn/zxcvbn.c
index 2ee61f297..26237fba8 100644
--- a/src/zxcvbn/zxcvbn.c
+++ b/src/zxcvbn/zxcvbn.c
@@ -45,9 +45,11 @@
 #endif
 
 /* For pre-compiled headers under windows */
+#ifndef __MINGW32__
 #ifdef _WIN32
 #include "stdafx.h"
 #endif
+#endif
 
 /* Minimum number of characters in a incrementing/decrementing sequence match */
 #define MIN_SEQUENCE_LEN 3