diff --git a/Makefile b/Makefile
index 899d4127da592..3ab8f9444f932 100644
--- a/Makefile
+++ b/Makefile
@@ -611,11 +611,11 @@ else
 	$(error no win-extras target for ARCH=$(ARCH))
 endif
 	cd $(JULIAHOME)/dist-extras && \
-	$(JLDOWNLOAD) https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/unsis/nsis-2.46.5-Unicode-setup.exe && \
-	$(JLCHECKSUM) nsis-2.46.5-Unicode-setup.exe && \
+	$(JLDOWNLOAD) https://sourceforge.net/projects/nsis/files/NSIS%203/3.04/nsis-3.04-setup.exe && \
+	$(JLCHECKSUM) nsis-3.04-setup.exe && \
 	chmod a+x 7z.exe && \
 	chmod a+x 7z.dll && \
-	$(call spawn,./7z.exe) x -y -onsis nsis-2.46.5-Unicode-setup.exe && \
+	$(call spawn,./7z.exe) x -y -onsis nsis-3.04-setup.exe && \
 	chmod a+x ./nsis/makensis.exe
 
 # various statistics about the build that may interest the user
diff --git a/contrib/windows/build-installer.nsi b/contrib/windows/build-installer.nsi
index 8896b0a0b1552..21415da06c9bb 100644
--- a/contrib/windows/build-installer.nsi
+++ b/contrib/windows/build-installer.nsi
@@ -1,3 +1,5 @@
+Unicode true
+
 !include "MUI2.nsh"
 !include "nsDialogs.nsh"
 !include "winmessages.nsh"
@@ -153,5 +155,3 @@ FunctionEnd
 Function ShowInstallFolder
     ExecShell "open" $INSTDIR
 FunctionEnd
-
-
diff --git a/deps/checksums/nsis-2.46.5-Unicode-setup.exe/md5 b/deps/checksums/nsis-2.46.5-Unicode-setup.exe/md5
deleted file mode 100644
index fc15d8010f1c6..0000000000000
--- a/deps/checksums/nsis-2.46.5-Unicode-setup.exe/md5
+++ /dev/null
@@ -1 +0,0 @@
-bce16e21a2d1b04bc360345b371da92d
diff --git a/deps/checksums/nsis-2.46.5-Unicode-setup.exe/sha512 b/deps/checksums/nsis-2.46.5-Unicode-setup.exe/sha512
deleted file mode 100644
index 01bac35379e2a..0000000000000
--- a/deps/checksums/nsis-2.46.5-Unicode-setup.exe/sha512
+++ /dev/null
@@ -1 +0,0 @@
-821095cb049b96a81fc7a584f0e3f4447dbcb874172b63927bde77ea8ad6adeb4d9f325c6b0d3848ea8c7065f82d9e0befe9bb13e88cc7e8439d532af9e9c4e3
diff --git a/deps/checksums/nsis-3.04-setup.exe/md5 b/deps/checksums/nsis-3.04-setup.exe/md5
new file mode 100644
index 0000000000000..dd2ee5545ece6
--- /dev/null
+++ b/deps/checksums/nsis-3.04-setup.exe/md5
@@ -0,0 +1 @@
+3c93427c56714478bb5a7a4bbaab934f
diff --git a/deps/checksums/nsis-3.04-setup.exe/sha512 b/deps/checksums/nsis-3.04-setup.exe/sha512
new file mode 100644
index 0000000000000..4216a8ccb295e
--- /dev/null
+++ b/deps/checksums/nsis-3.04-setup.exe/sha512
@@ -0,0 +1 @@
+55142f5eeada65f18f6de950ead5342d78e1a4a01b7620d02dae2fbd3f0d963db482f5a63939131e81a78b458c5306f600578ab96891b0661cb0b74be1f7636d