diff --git a/CMakeLists.txt b/CMakeLists.txt
index 47a6014bb..020172203 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -16,7 +16,7 @@ if(CCACHE_PROGRAM)
 endif()
 
 project(lokinet
-    VERSION 0.8.4
+    VERSION 0.8.5
     DESCRIPTION "lokinet - IP packet onion router"
     LANGUAGES C CXX)
 
diff --git a/cmake/StaticBuild.cmake b/cmake/StaticBuild.cmake
index ebac3a402..95909a140 100644
--- a/cmake/StaticBuild.cmake
+++ b/cmake/StaticBuild.cmake
@@ -278,7 +278,10 @@ add_static_target(sqlite3 sqlite3_external libsqlite3.a)
 
 
 if(ARCH_TRIPLET MATCHES mingw)
-  set(zmq_extra --with-poller=wepoll)
+  option(WITH_WEPOLL "use wepoll zmq poller (crashy)" OFF)
+  if(WITH_WEPOLL)
+    set(zmq_extra --with-poller=wepoll)
+  endif()
 endif()
 
 if(CMAKE_CROSSCOMPILING AND ARCH_TRIPLET MATCHES mingw)
diff --git a/cmake/win32_installer_deps.cmake b/cmake/win32_installer_deps.cmake
index 241c088e7..028d3445f 100644
--- a/cmake/win32_installer_deps.cmake
+++ b/cmake/win32_installer_deps.cmake
@@ -1,6 +1,6 @@
 if(NOT GUI_ZIP_URL)
-  set(GUI_ZIP_URL "https://oxen.rocks/oxen-io/loki-network-control-panel/lokinet-gui-windows-32bit-v0.3.6.zip")
-  set(GUI_ZIP_HASH_OPTS EXPECTED_HASH SHA256=6feeb4df1983f00ee686b3de8b56e3e73c55d7d1a8a41b746a37234a426add31)
+  set(GUI_ZIP_URL "https://oxen.rocks/oxen-io/loki-network-control-panel/lokinet-gui-windows-32bit-v0.3.7.zip")
+  set(GUI_ZIP_HASH_OPTS EXPECTED_HASH SHA256=faafb5c7c8b9831f572ed78bb2cf8454bfa0d5f79897ce31e64e4a4331d55045)
 endif()
 
 set(TUNTAP_URL "https://build.openvpn.net/downloads/releases/latest/tap-windows-latest-stable.exe")
diff --git a/contrib/windows.sh b/contrib/windows.sh
index dddecd94a..cf8a94e7f 100755
--- a/contrib/windows.sh
+++ b/contrib/windows.sh
@@ -3,5 +3,5 @@ set -e
 set +x
 mkdir -p build-windows
 cd build-windows
-cmake -G Ninja -DCMAKE_EXE_LINKER_FLAGS=-fstack-protector -DCMAKE_CXX_FLAGS=-fdiagnostics-color=always -DCMAKE_TOOLCHAIN_FILE=../contrib/cross/mingw64.cmake -DBUILD_STATIC_DEPS=ON -DBUILD_PACKAGE=ON -DBUILD_SHARED_LIBS=OFF -DBUILD_TESTING=OFF -DWITH_TESTS=OFF -DNATIVE_BUILD=OFF -DSTATIC_LINK=ON -DWITH_SYSTEMD=OFF -DFORCE_LOKIMQ_SUBMODULE=ON -DSUBMODULE_CHECK=OFF -DWITH_LTO=OFF -DCMAKE_BUILD_TYPE=Release ..
+cmake -G Ninja -DCMAKE_EXE_LINKER_FLAGS=-fstack-protector -DCMAKE_CXX_FLAGS=-fdiagnostics-color=always -DCMAKE_TOOLCHAIN_FILE=../contrib/cross/mingw64.cmake -DBUILD_STATIC_DEPS=ON -DBUILD_PACKAGE=ON -DBUILD_LIBLOKINET=OFF -DBUILD_SHARED_LIBS=OFF -DBUILD_TESTING=OFF -DWITH_TESTS=OFF -DNATIVE_BUILD=OFF -DSTATIC_LINK=ON -DWITH_SYSTEMD=OFF -DFORCE_OXENMQ_SUBMODULE=ON -DSUBMODULE_CHECK=OFF -DWITH_LTO=OFF -DCMAKE_BUILD_TYPE=Release $@ ..
 ninja package
diff --git a/win32-setup/lokinet.ico b/win32-setup/lokinet.ico
index 274d3b3a2..6efad9833 100644
Binary files a/win32-setup/lokinet.ico and b/win32-setup/lokinet.ico differ