diff --git a/indra/newview/installers/windows/installer_template.nsi b/indra/newview/installers/windows/installer_template.nsi
index 42f8e0ce1f04d1d9d270e4eb5b2a33dfcfbfa2c0..7a135fa53cafec88b4aee0fd2fb95b77cf5a982e 100644
--- a/indra/newview/installers/windows/installer_template.nsi
+++ b/indra/newview/installers/windows/installer_template.nsi
@@ -91,6 +91,7 @@ SetOverwrite on							# Overwrite files by default
 AutoCloseWindow true					# After all files install, close window
 
 InstallDir "%%$PROGRAMFILES%%\${INSTNAME}"
+%%REGISTRY%%
 InstallDirRegKey HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\${INSTNAME}" ""
 UninstallText $(UninstallTextMsg)
 DirText $(DirectoryChooseTitle) $(DirectoryChooseSetup)
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index 1b2c5027292df02274a402fa81638ead2070107f..7ea600f24a8f6f8aa4928fc5db5e07269bf45d50 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -632,8 +632,10 @@ def package_finish(self):
             """
 
         if(self.args['arch'].lower() == 'x86_64'):
+            registry="SetRegView 64"
             program_files="$PROGRAMFILES64"
         else:
+            registry="SetRegView 32"
             program_files="$PROGRAMFILES32"
 
         tempfile = "secondlife_setup_tmp.nsi"
@@ -645,6 +647,7 @@ def package_finish(self):
                 "%%INST_VARS%%":inst_vars_template % substitution_strings,
                 "%%INSTALL_FILES%%":self.nsi_file_commands(True),
                 "%%$PROGRAMFILES%%":program_files,
+                "%%REGISTRY%%":registry,
                 "%%DELETE_FILES%%":self.nsi_file_commands(False)})
 
         # We use the Unicode version of NSIS, available from