diff --git a/direct/src/p3d/DeploymentTools.py b/direct/src/p3d/DeploymentTools.py
index 5fc042d6f1c..02012cd87fc 100644
--- a/direct/src/p3d/DeploymentTools.py
+++ b/direct/src/p3d/DeploymentTools.py
@@ -590,6 +590,7 @@ def installPackagesInto(self, hostDir, platform):
             if package.platform:
                 xpackage.SetAttribute('platform', package.platform)
                 assert package.platform == platform
+            xpackage.SetAttribute('per_platform', '1')
             if package.packageVersion:
                 xpackage.SetAttribute('version', version)
                 xpackage.SetAttribute('filename', package.packageName + "/" + package.packageVersion + "/" + package.descFileBasename)
@@ -1161,6 +1162,7 @@ def buildNSIS(self, output, platform):
                     print >>nsi, '  SetOutPath "$INSTDIR\\%s"' % outdir
                     curdir = outdir
                 print >>nsi, '  File "%s"' % (basefile.toOsSpecific())
+        print >>nsi, '  SetOutPath "$INSTDIR"'
         print >>nsi, '  WriteUninstaller "$INSTDIR\\Uninstall.exe"'
         print >>nsi, '  ; Start menu items'
         print >>nsi, '  !insertmacro MUI_STARTMENU_WRITE_BEGIN Application'