diff --git a/src/windows/README.txt b/src/windows/README.txt
index 39aac8ebc..cf6726212 100644
--- a/src/windows/README.txt
+++ b/src/windows/README.txt
@@ -8,18 +8,20 @@ TRANSLATORS:
    english message to help you with the translation.
 4. Edit only the part inside the quotation marks(""). Unless you know 
    what you are doing.
-5. Submit your changes: 1) as a pull request to the official git repo or
+5. Save the files with utf8 encoding and BOM.
+6. Submit your changes: 1) as a pull request to the official git repo or
    2) open an issue to the bugtracker and attach them or 3) via email or
    4)the same way you provide the tranlations for qbt itself
 
 PACKAGERS:
 
-You will need NSIS and upx to make the installer.
+You will need NSIS and upx to make the installer. You need a unicode version of NSIS.
+I tested with NSIS 3.0a0. 
 
 1. Open the options.nsi file in an editor and change line that contains
    "!define PROG_VERSION "3.0.3"" to the version of qbittorrent you just built. 
-2. Extract the plugins found in the folder "nsis plugins" into the your 
-   NSIS's Plugin directory(usually C:\Program Files\NSIS\Plugins).
+2. Extract the plugins found in the folder "nsis plugins" into your 
+   NSIS's unicode Plugin directory(usually C:\Program Files\NSIS\Plugins\x86-unicode).
    Only the *.dll files are needed.
 3. The script you need to compile is "qbittorrent.nsi". It includes all other necessary scripts.
 4. The script expects the following file tree:
diff --git a/src/windows/installer.nsi b/src/windows/installer.nsi
index 9c77fe565..562516b10 100644
--- a/src/windows/installer.nsi
+++ b/src/windows/installer.nsi
@@ -120,7 +120,7 @@ SectionEnd
 Section $(inst_firewall)
 
   DetailPrint $(inst_firewallinfo)
-  nsisFirewall::AddAuthorizedApplication "$INSTDIR\qbittorrent.exe" "qBittorrent" 
+  nsisFirewallW::AddAuthorizedApplication "$INSTDIR\qbittorrent.exe" "qBittorrent" 
     
 SectionEnd
 
diff --git a/src/windows/nsis plugins/FindProc Unicode-source.zip b/src/windows/nsis plugins/FindProc Unicode-source.zip
new file mode 100644
index 000000000..581b7e8d2
Binary files /dev/null and b/src/windows/nsis plugins/FindProc Unicode-source.zip differ
diff --git a/src/windows/nsis plugins/FindProc.zip b/src/windows/nsis plugins/FindProc.zip
deleted file mode 100644
index ae28a71f4..000000000
Binary files a/src/windows/nsis plugins/FindProc.zip and /dev/null differ
diff --git a/src/windows/nsis plugins/FindProcDLL Unicode bin.zip b/src/windows/nsis plugins/FindProcDLL Unicode bin.zip
new file mode 100644
index 000000000..2b55d90f6
Binary files /dev/null and b/src/windows/nsis plugins/FindProcDLL Unicode bin.zip differ
diff --git a/src/windows/options.nsi b/src/windows/options.nsi
index adb86786c..ad367b055 100644
--- a/src/windows/options.nsi
+++ b/src/windows/options.nsi
@@ -1,3 +1,4 @@
+Unicode true
 ;Compress the header too
 !packhdr "$%TEMP%\exehead.tmp" 'upx.exe -9 --best --ultra-brute "$%TEMP%\exehead.tmp"'
 
@@ -79,4 +80,4 @@ RequestExecutionLevel admin
 !insertmacro MUI_UNPAGE_INSTFILES
 
 !insertmacro MUI_RESERVEFILE_LANGDLL
-ReserveFile "${NSISDIR}\Plugins\FindProcDLL.dll"
+ReserveFile "${NSISDIR}\Plugins\x86-unicode\FindProcDLL.dll"
diff --git a/src/windows/uninstaller.nsi b/src/windows/uninstaller.nsi
index 14150b425..3a16ade2f 100644
--- a/src/windows/uninstaller.nsi
+++ b/src/windows/uninstaller.nsi
@@ -81,7 +81,7 @@ SectionEnd
 Section "un.$(remove_firewall)" ;
 
   DetailPrint $(remove_firewallinfo)
-  nsisFirewall::RemoveAuthorizedApplication "$INSTDIR\qbittorrent.exe"
+  nsisFirewallW::RemoveAuthorizedApplication "$INSTDIR\qbittorrent.exe"
   
 SectionEnd