diff --git a/Makefile b/Makefile
index 1142e216216ab6874493f3d93749d47f7f4bfc0d..370087235db517f5af39d07e4f1bd48c776a815d 100755
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,15 @@ SYSTRAY := 0xacab.org/leap/bitmask-systray
 STAGING := staging
 
 deps_win:
-	choco install -y golang python upx nssm nsis
+	choco install -y golang python upx nssm nsis wget 7zip
+openvpn_win:
+	mkdir staging\openvpn
+	wget https://downloads.leap.se/thirdparty/windows/openvpn-x86_64-w64-mingw32.tar.bz2 -O staging/openvpn/openvpn.tar.bz2
+	7z e -y -ostaging/openvpn/ staging/openvpn/openvpn.tar.bz2
+	7z e -y -r -ostaging/openvpn/ staging/openvpn/openvpn.tar *.dll
+	7z e -y -r -ostaging/openvpn/ staging/openvpn/openvpn.tar *.exe
+	copy .\staging\openvpn\openvpn.exe .\staging
+	copy .\staging\openvpn\*.dll .\staging
 helper_win:
 	go build -ldflags "-s -w" -o $(STAGING)/bitmask_helper.exe .\helper
 	upx $(STAGING)/bitmask_helper.exe
diff --git a/win/RiseupVPN-installer.nsi b/win/RiseupVPN-installer.nsi
index 3561c57b31473a1ad07f92a96db3a3c750774bc8..e1fc135f29e528b9840dbcddf85c90692e8f6120 100755
--- a/win/RiseupVPN-installer.nsi
+++ b/win/RiseupVPN-installer.nsi
@@ -1,11 +1,10 @@
 !include "MUI.nsh"
 
 Name "RiseupVPN"
-RequestExecutionLevel admin
-
 Outfile "..\dist\RiseupVPN-installer.exe"
 ;TODO make the installdir configurable - and set it in the registry.
 InstallDir "C:\Program Files\RiseupVPN\"
+RequestExecutionLevel admin
 
 
 !define BITMAP_FILE riseupvpn.bmp
@@ -87,6 +86,9 @@ Section "InstallService"
   ExecWait '"$INSTDIR\nssm.exe" set riseupvpn-helper AppDirectory "$INSTDIR"'
   ExecWait '"$INSTDIR\nssm.exe" start riseupvpn-helper'
 
+  ; why are these here?
+  Delete "C:\riseupvpn.ico"
+  Delete "C:\riseupvpn.png"
 SectionEnd
 
 Section "Uninstall"
diff --git a/win/payload/install b/win/payload/install
index 2ce115925733e5df172db927610817dfa9c5d48e..465491d18b38f81b75434150ab719b42e91ab949 100755
--- a/win/payload/install
+++ b/win/payload/install
@@ -1,8 +1,8 @@
 ..\staging\bitmask_helper.exe
 ..\staging\bitmask-systray.exe
-..\staging\openssl.exe
-..\staging\openvpn.exe
-..\staging\ssleay32.dll
-..\staging\libeay32.dll
+..\staging\libcrypto-1_1-x64.dll
 ..\staging\liblzo2-2.dll
 ..\staging\libpkcs11-helper-1.dll
+..\staging\libssl-1_1-x64.dll
+..\staging\openvpn.exe
+..\staging\padlock.dll