diff --git a/CMakeLists.txt b/CMakeLists.txt
index a4cb4d1fc..dfba16788 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -339,6 +339,8 @@ if(ZLIB_VERSION_STRING VERSION_LESS "1.2.0")
   message(FATAL_ERROR "zlib 1.2.0 or higher is required to use the gzip format")
 endif()
 
+include_directories(SYSTEM ${ARGON2_INCLUDE_DIR})
+
 # Optional
 if(WITH_XC_YUBIKEY)
   find_package(YubiKey REQUIRED)
diff --git a/COPYING b/COPYING
index 8095ef067..5108458d8 100644
--- a/COPYING
+++ b/COPYING
@@ -235,3 +235,7 @@ License: LGPL-2.1
 Files: share/macosx/dmg-background.tiff
 Copyright: 2008-2014, Andrey Tarantsov
 License: MIT
+
+Files: cmake/DeployQt.cmake
+Copyright: 2018, Nathan Osman
+License: MIT
diff --git a/appveyor.yml b/appveyor.yml
new file mode 100644
index 000000000..bcb9b9e05
--- /dev/null
+++ b/appveyor.yml
@@ -0,0 +1,31 @@
+image:
+  - Visual Studio 2017
+
+configuration:
+  - Debug
+
+environment:
+    matrix:
+        - CC: gcc
+          CXX: g++
+
+clone_depth: 1
+
+platform:
+  - x64
+
+matrix:
+  fast_finish: true
+
+install:
+  - C:\msys64\usr\bin\env MSYSTEM=MINGW64 /bin/bash -l -c "pacman --noconfirm -Syu"
+  - C:\msys64\usr\bin\env MSYSTEM=MINGW64 /bin/bash -l -c "/c/projects/keepassxc/ci/appveyor/install.sh"
+
+before_build:
+  - C:\msys64\usr\bin\env MSYSTEM=MINGW64 /bin/bash -l -c "/c/projects/keepassxc/ci/appveyor/before-build.sh"
+
+build_script:
+  - C:\msys64\usr\bin\env MSYSTEM=MINGW64 /bin/bash -l -c "/c/projects/keepassxc/ci/appveyor/build.sh"
+
+test_script:
+  - C:\msys64\usr\bin\env MSYSTEM=MINGW64 /bin/bash -l -c "/c/projects/keepassxc/ci/appveyor/test.sh"
diff --git a/ci/appveyor/before-build.sh b/ci/appveyor/before-build.sh
new file mode 100644
index 000000000..ff8305985
--- /dev/null
+++ b/ci/appveyor/before-build.sh
@@ -0,0 +1,21 @@
+#!/usr/bin/bash
+
+cd /c/projects/keepassxc
+mkdir build && cd build
+
+if [ "${configuration}" = "Debug" ]; then
+  cmake -G "MSYS Makefiles" \
+    -DCMAKE_BUILD_TYPE=${configuration} \
+    -DWITH_XC_ALL=ON \
+    -DWITH_TESTS=ON \
+    -DWITH_GUI_TESTS=ON \
+    -DWITH_ASAN=ON \
+    ..
+else
+  cmake -G "MSYS Makefiles" \
+    -DCMAKE_BUILD_TYPE=${configuration} \
+    -DWITH_XC_ALL=ON \
+    -DWITH_TESTS=ON \
+    -DWITH_GUI_TESTS=ON \
+    ..
+fi
diff --git a/ci/appveyor/build.sh b/ci/appveyor/build.sh
new file mode 100644
index 000000000..b89ebd3ad
--- /dev/null
+++ b/ci/appveyor/build.sh
@@ -0,0 +1,5 @@
+#!/usr/bin/bash
+
+cd /c/projects/keepassxc/build
+
+make -j2
diff --git a/ci/appveyor/install.sh b/ci/appveyor/install.sh
new file mode 100644
index 000000000..c5c34c327
--- /dev/null
+++ b/ci/appveyor/install.sh
@@ -0,0 +1,24 @@
+#!/usr/bin/bash
+
+# Pacman derived dependencies
+pacman --needed --noconfirm -S \
+    mingw-w64-$(uname -m)-cmake \
+    mingw-w64-$(uname -m)-libgcrypt \
+    mingw-w64-$(uname -m)-zlib \
+    mingw-w64-$(uname -m)-libsodium \
+    mingw-w64-$(uname -m)-argon2 \
+    mingw-w64-$(uname -m)-qt5
+
+# Yubikey library
+curl -O -J -L https://developers.yubico.com/yubikey-personalization/Releases/ykpers-1.18.1-win64.zip
+7z x ykpers-1.18.1-win64.zip -o"/mingw64/" -aoa
+
+# qrencode library
+curl -O -J -L https://fukuchi.org/works/qrencode/qrencode-4.0.0.tar.gz
+tar -xf qrencode-4.0.0.tar.gz
+
+cd qrencode-4.0.0
+mkdir build && cd build
+cmake -G "MSYS Makefiles" -DBUILD_SHARED_LIBS=YES -DWITH_TOOLS=NO -DCMAKE_BUILD_TYPE=${configuration} ..
+make -j2
+make install PREFIX="/mingw64"
\ No newline at end of file
diff --git a/ci/appveyor/test.sh b/ci/appveyor/test.sh
new file mode 100644
index 000000000..b7a8a2121
--- /dev/null
+++ b/ci/appveyor/test.sh
@@ -0,0 +1,6 @@
+#!/usr/bin/bash
+
+cd /c/projects/keepassxc/build
+
+make test ARGS+="-E testgui --output-on-failure --verbose"
+make test ARGS+="-R testgui --output-on-failure --verbose"
diff --git a/cmake/DeployQt.cmake b/cmake/DeployQt.cmake
new file mode 100644
index 000000000..a9d239be8
--- /dev/null
+++ b/cmake/DeployQt.cmake
@@ -0,0 +1,88 @@
+# The MIT License (MIT)
+#
+# Copyright (c) 2018 Nathan Osman
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+find_package(Qt5Core REQUIRED)
+
+# Retrieve the absolute path to qmake and then use that path to find
+# the windeployqt and macdeployqt binaries
+get_target_property(_qmake_executable Qt5::qmake IMPORTED_LOCATION)
+get_filename_component(_qt_bin_dir "${_qmake_executable}" DIRECTORY)
+
+find_program(WINDEPLOYQT_EXECUTABLE windeployqt HINTS "${_qt_bin_dir}")
+if(WIN32 AND NOT WINDEPLOYQT_EXECUTABLE)
+    message(FATAL_ERROR "windeployqt not found")
+endif()
+
+find_program(MACDEPLOYQT_EXECUTABLE macdeployqt HINTS "${_qt_bin_dir}")
+if(APPLE AND NOT MACDEPLOYQT_EXECUTABLE)
+    message(FATAL_ERROR "macdeployqt not found")
+endif()
+
+# Add commands that copy the required Qt files to the same directory as the
+# target after being built as well as including them in final installation
+function(windeployqt target)
+
+    # Run windeployqt immediately after build
+    add_custom_command(TARGET ${target} POST_BUILD
+        COMMAND "${CMAKE_COMMAND}" -E
+            env PATH="${_qt_bin_dir}" "${WINDEPLOYQT_EXECUTABLE}"
+                --verbose 0
+                --no-compiler-runtime
+                --no-angle
+                --no-opengl-sw
+                \"$<TARGET_FILE:${target}>\"
+        COMMENT "Deploying Qt..."
+    )
+
+    # windeployqt doesn't work correctly with the system runtime libraries,
+    # so we fall back to one of CMake's own modules for copying them over
+
+    # Doing this with MSVC 2015 requires CMake 3.6+
+    if((MSVC_VERSION VERSION_EQUAL 1900 OR MSVC_VERSION VERSION_GREATER 1900)
+            AND CMAKE_VERSION VERSION_LESS "3.6")
+        message(WARNING "Deploying with MSVC 2015+ requires CMake 3.6+")
+    endif()
+
+    set(CMAKE_INSTALL_UCRT_LIBRARIES TRUE)
+    include(InstallRequiredSystemLibraries)
+    foreach(lib ${CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS})
+        get_filename_component(filename "${lib}" NAME)
+        add_custom_command(TARGET ${target} POST_BUILD
+            COMMAND "${CMAKE_COMMAND}" -E
+                copy_if_different "${lib}" \"$<TARGET_FILE_DIR:${target}>\"
+            COMMENT "Copying ${filename}..."
+        )
+    endforeach()
+endfunction()
+
+# Add commands that copy the required Qt files to the application bundle
+# represented by the target.
+function(macdeployqt target)
+    add_custom_command(TARGET ${target} POST_BUILD
+        COMMAND "${MACDEPLOYQT_EXECUTABLE}"
+            \"$<TARGET_FILE_DIR:${target}>/../..\"
+            -always-overwrite
+        COMMENT "Deploying Qt..."
+    )
+endfunction()
+
+mark_as_advanced(WINDEPLOYQT_EXECUTABLE MACDEPLOYQT_EXECUTABLE)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 432d10eed..012fc29db 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -313,11 +313,8 @@ if(APPLE AND WITH_APP_BUNDLE)
   set(CPACK_PACKAGE_FILE_NAME "${PROGNAME}-${KEEPASSXC_VERSION}")
   include(CPack)
 
-  add_custom_command(TARGET ${PROGNAME}
-                     POST_BUILD
-                     COMMAND ${MACDEPLOYQT_EXE} ${PROGNAME}.app
-                     WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/src
-                     COMMENT "Deploying app bundle")
+  include(DeployQt)
+  macdeployqt(${PROGNAME})
 endif()
 
 install(TARGETS ${PROGNAME}
@@ -378,8 +375,8 @@ if(MINGW)
   set(gp_tool \"objdump\")
   " COMPONENT Runtime)
 
-  include(DeployQt4)
-  install_qt4_executable(${PROGNAME}.exe)
+  include(DeployQt)
+  windeployqt(${PROGNAME})
   
   # install Qt5 plugins
   set(PLUGINS_DIR ${Qt5_PREFIX}/share/qt5/plugins)
diff --git a/src/autotype/mac/CMakeLists.txt b/src/autotype/mac/CMakeLists.txt
index 08c532784..9ec8b71ac 100644
--- a/src/autotype/mac/CMakeLists.txt
+++ b/src/autotype/mac/CMakeLists.txt
@@ -11,10 +11,11 @@ set_target_properties(keepassx-autotype-cocoa PROPERTIES LINK_FLAGS "-framework
 target_link_libraries(keepassx-autotype-cocoa ${PROGNAME} Qt5::Core Qt5::Widgets)
 
 if(WITH_APP_BUNDLE)
+  include(DeployQt)
   add_custom_command(TARGET keepassx-autotype-cocoa
                      POST_BUILD
                      COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/libkeepassx-autotype-cocoa.so ${PLUGIN_INSTALL_DIR}
-                     COMMAND ${MACDEPLOYQT_EXE} ${PROGNAME}.app -executable=${PLUGIN_INSTALL_DIR}/libkeepassx-autotype-cocoa.so -no-plugins
+                     COMMAND ${MACDEPLOYQT_EXECUTABLE} ${PROGNAME}.app -executable=${PLUGIN_INSTALL_DIR}/libkeepassx-autotype-cocoa.so -no-plugins
                      WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/src
   COMMENT "Deploying autotype plugin")
 else()