diff --git a/doc/Changelog b/doc/Changelog
index daf94ab03..58b60adad 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,7 @@
+26 July 2018: Wouter
+	- Fix #4135: 64-bit Windows Installer Creates Entries Under The
+	  Wrong Registry Key.
+
 23 July 2018: Wouter
 	- Fix use-systemd readiness signalling, only when use-systemd is yes
 	  and not in signal handler.
diff --git a/makedist.sh b/makedist.sh
index ffc00c13b..359ee3817 100755
--- a/makedist.sh
+++ b/makedist.sh
@@ -368,9 +368,9 @@ if [ "$DOWIN" = "yes" ]; then
     info "Creating installer"
     quadversion=`cat ../config.h | grep RSRC_PACKAGE_VERSION | sed -e 's/#define RSRC_PACKAGE_VERSION //' -e 's/,/\\./g'`
     cat ../winrc/setup.nsi | sed -e 's/define VERSION.*$/define VERSION "'$version'"/' -e 's/define QUADVERSION.*$/define QUADVERSION "'$quadversion'"/' > ../winrc/setup_ed.nsi
-    if test "$W64" = "yes"; then
+    if test "$W64" = "no"; then
 	mv ../winrc/setup_ed.nsi ../winrc/setup_ed_old.nsi
-	cat ../winrc/setup_ed_old.nsi | sed -e 's/PROGRAMFILES/PROGRAMFILES64/' > ../winrc/setup_ed.nsi
+	cat ../winrc/setup_ed_old.nsi | sed -e 's/PROGRAMFILES64/PROGRAMFILES/' -e 's/SetRegView 64/SetRegView 32/' > ../winrc/setup_ed.nsi
     fi
     "$makensis" ../winrc/setup_ed.nsi
     info "Created installer"
diff --git a/winrc/setup.nsi b/winrc/setup.nsi
index 8f0852280..ceb5c2b4a 100644
--- a/winrc/setup.nsi
+++ b/winrc/setup.nsi
@@ -14,7 +14,8 @@ outFile "unbound_setup_${VERSION}.exe"
 Name "Unbound"
 
 # default install directory
-installDir "$PROGRAMFILES\Unbound"
+SetRegView 64
+installDir "$PROGRAMFILES64\Unbound"
 installDirRegKey HKLM "Software\Unbound" "InstallLocation"
 RequestExecutionLevel admin
 #give credits to Nullsoft: BrandingText ""