diff --git a/makepanda/installer.nsi b/makepanda/installer.nsi
index c3f9745b4a..60de4bcc9d 100644
--- a/makepanda/installer.nsi
+++ b/makepanda/installer.nsi
@@ -367,7 +367,7 @@ Section "Tools and utilities" SecTools
     SetDetailsPrint listonly
 
     SetOutPath "$INSTDIR\bin"
-    File /r "${BUILT}\bin\*.exe"
+    File /r /x deploy-stub.exe /x deploy-stubw.exe "${BUILT}\bin\*.exe"
     File /nonfatal /r "${BUILT}\bin\*.p3d"
     SetOutPath "$INSTDIR\NSIS"
     File /r /x CVS "${NSISDIR}\*"
diff --git a/makepanda/installpanda.py b/makepanda/installpanda.py
index fe5ee97563..7f9b79cd60 100644
--- a/makepanda/installpanda.py
+++ b/makepanda/installpanda.py
@@ -220,12 +220,15 @@ def InstallPanda(destdir="", prefix="/usr", outputdir="built", libdir=GetLibDir(
     else:
         oscmd("echo '"+libdir+"/panda3d'>    "+destdir+"/etc/ld.so.conf.d/panda3d.conf")
 
-    oscmd("cp "+outputdir+"/bin/*               "+destdir+prefix+"/bin/")
     for base in os.listdir(outputdir+"/lib"):
         if (not base.endswith(".a")) or base == "libp3pystub.a":
             # We really need to specify -R in order not to follow symlinks on non-GNU
             oscmd("cp -R -P "+outputdir+"/lib/"+base+" "+destdir+libdir+"/panda3d/"+base)
 
+    for base in os.listdir(outputdir+"/bin"):
+        if not base.startswith("deploy-stub"):
+            oscmd("cp -R -P "+outputdir+"/bin/"+base+" "+destdir+prefix+"/bin/"+base)
+
     DeleteVCS(destdir+prefix+"/share/panda3d")
     DeleteBuildFiles(destdir+prefix+"/share/panda3d")
     DeleteEmptyDirs(destdir+prefix+"/share/panda3d")
diff --git a/makepanda/makepackage.py b/makepanda/makepackage.py
index e23bedffd7..a4eadaf38a 100755
--- a/makepanda/makepackage.py
+++ b/makepanda/makepackage.py
@@ -512,9 +512,10 @@ def MakeInstallerOSX(version, runtime=False, python_versions=[], **kwargs):
     oscmd("install -m 0644 doc/man/*.1 dstroot/tools/usr/local/share/man/man1/")
 
     for base in os.listdir(outputdir+"/bin"):
-        binname = "dstroot/tools/Developer/Panda3D/bin/" + base
-        # OSX needs the -R argument to copy symbolic links correctly, it doesn't have -d. How weird.
-        oscmd("cp -R " + outputdir + "/bin/" + base + " " + binname)
+        if not base.startswith("deploy-stub"):
+            binname = "dstroot/tools/Developer/Panda3D/bin/" + base
+            # OSX needs the -R argument to copy symbolic links correctly, it doesn't have -d. How weird.
+            oscmd("cp -R " + outputdir + "/bin/" + base + " " + binname)
 
     if python_versions:
         # Let's only write a ppython link if there is only one Python version.