diff --git a/direct/src/directscripts/packpanda.nsi b/direct/src/directscripts/packpanda.nsi
index 82d8aa1b59..89681b399a 100755
--- a/direct/src/directscripts/packpanda.nsi
+++ b/direct/src/directscripts/packpanda.nsi
@@ -87,7 +87,7 @@ Section "${SMDIRECTORY}" SecCore
         SetOutPath $INSTDIR
         File "${PANDA}\LICENSE"
         SetOutPath $INSTDIR\bin
-        File /r "${PANDA}\bin\*.dll"
+        File /x CVS /x *.pyc /x *.map /x *.pdb /x *.exe /r "${PANDA}\bin\*"
         SetOutPath $INSTDIR\etc
         File /r "${PANDA}\etc\*"
         SetOutPath $INSTDIR\direct
@@ -96,8 +96,6 @@ Section "${SMDIRECTORY}" SecCore
         File "${PANDA}\direct\__init__.py"
         SetOutPath $INSTDIR\pandac
         File /r "${PANDA}\pandac\*.py"
-        SetOutPath $INSTDIR\python
-        File /r /x CVS /x *.pyc "${PANDA}\python\*"
 
         RMDir /r "$SMPROGRAMS\${SMDIRECTORY}"
         CreateDirectory "$SMPROGRAMS\${SMDIRECTORY}"
@@ -107,10 +105,10 @@ Section "${SMDIRECTORY}" SecCore
             SetOutPath $INSTDIR\models\audio
             File /r /x CVS "${PANDA}\models\audio\*"
             SetOutPath $INSTDIR\bin
-            File /r "${PANDA}\bin\ppython.exe"
+            File /r "${PANDA}\bin\ppythonw.exe"
             SetOutpath $INSTDIR\game
             File /r "${PPGAME}\*"
-            CreateShortCut "$SMPROGRAMS\${SMDIRECTORY}\Play ${NAME}.lnk" "$INSTDIR\bin\ppython.exe" "${PPMAIN}" "$INSTDIR\${PPICON}" 0 SW_SHOWMINIMIZED "" "Play ${NAME}"
+            CreateShortCut "$SMPROGRAMS\${SMDIRECTORY}\Play ${NAME}.lnk" "$INSTDIR\bin\ppythonw.exe" "${PPMAIN}" "$INSTDIR\${PPICON}" 0 SW_SHOWMINIMIZED "" "Play ${NAME}"
 
         !else
 
@@ -136,7 +134,7 @@ Section "${SMDIRECTORY}" SecCore
             SetOutPath $INSTDIR
             File /r /x CVS "${PANDA}\ReleaseNotes"
             !ifdef PYEXTRAS
-            SetOutPath $INSTDIR\python\lib
+            SetOutPath $INSTDIR\bin\lib
             File /nonfatal /r "${PYEXTRAS}\*"
             !endif
             SetOutPath $INSTDIR\models
@@ -148,10 +146,10 @@ Section "${SMDIRECTORY}" SecCore
             WriteINIStr $INSTDIR\Website.url "InternetShortcut" "URL" "http://panda3d.etc.cmu.edu/"
             WriteINIStr $INSTDIR\Manual.url "InternetShortcut" "URL" "http://panda3d.etc.cmu.edu/wiki/index.php"
             SetOutPath $INSTDIR\samples\GreetingCard
-            CreateShortCut "$SMPROGRAMS\${SMDIRECTORY}\Panda Greeting Card.lnk" "$INSTDIR\bin\ppython.exe" 'GreetingCard.py "$SMPROGRAMS\${SMDIRECTORY}"' "$INSTDIR\bin\ppython.exe" 0 SW_SHOWMINIMIZED "" "Panda Greeting Card"
+            CreateShortCut "$SMPROGRAMS\${SMDIRECTORY}\Panda Greeting Card.lnk" "$INSTDIR\bin\ppythonw.exe" 'GreetingCard.py "$SMPROGRAMS\${SMDIRECTORY}"' "$INSTDIR\bin\ppythonw.exe" 0 SW_SHOWMINIMIZED "" "Panda Greeting Card"
             SetOutPath $INSTDIR
-            CreateShortCut "$SMPROGRAMS\${SMDIRECTORY}\Panda Manual.lnk" "$INSTDIR\Manual.url" "" "$INSTDIR\bin\ppython.exe" 0 "" "" "Panda Manual"
-            CreateShortCut "$SMPROGRAMS\${SMDIRECTORY}\Panda Website.lnk" "$INSTDIR\Website.url" "" "$INSTDIR\bin\ppython.exe" 0 "" "" "Panda Website"
+            CreateShortCut "$SMPROGRAMS\${SMDIRECTORY}\Panda Manual.lnk" "$INSTDIR\Manual.url" "" "$INSTDIR\bin\ppythonw.exe" 0 "" "" "Panda Manual"
+            CreateShortCut "$SMPROGRAMS\${SMDIRECTORY}\Panda Website.lnk" "$INSTDIR\Website.url" "" "$INSTDIR\bin\ppythonw.exe" 0 "" "" "Panda Website"
 
             FindFirst $0 $1 $INSTDIR\samples\*--*
             loop:
@@ -179,8 +177,8 @@ Section "${SMDIRECTORY}" SecCore
                     Call StrRep
                     Pop $R0
                     StrCpy $TUTNAME $R0
-                    CreateShortCut "$SMPROGRAMS\${SMDIRECTORY}\$READABLE\Run $TUTNAME.lnk" "$INSTDIR\bin\ppython.exe" "$3" "$INSTDIR\bin\ppython.exe" 0 SW_SHOWMINIMIZED "" "Run $TUTNAME"
-                    CreateShortCut "$INSTDIR\samples\$1\Run $TUTNAME.lnk" "$INSTDIR\bin\ppython.exe" "$3" "$INSTDIR\bin\ppython.exe" 0 SW_SHOWMINIMIZED "" "Run $TUTNAME"
+                    CreateShortCut "$SMPROGRAMS\${SMDIRECTORY}\$READABLE\Run $TUTNAME.lnk" "$INSTDIR\bin\ppythonw.exe" "$3" "$INSTDIR\bin\ppythonw.exe" 0 SW_SHOWMINIMIZED "" "Run $TUTNAME"
+                    CreateShortCut "$INSTDIR\samples\$1\Run $TUTNAME.lnk" "$INSTDIR\bin\ppythonw.exe" "$3" "$INSTDIR\bin\ppythonw.exe" 0 SW_SHOWMINIMIZED "" "Run $TUTNAME"
                     FindNext $2 $3
                     goto iloop
                 idone: