diff --git a/direct/src/showutil/dist.py b/direct/src/showutil/dist.py
index f059f2f172..6879f59717 100644
--- a/direct/src/showutil/dist.py
+++ b/direct/src/showutil/dist.py
@@ -26,6 +26,8 @@ def find_packages(whlfile):
     return [
          i for i in filelist
          if '.so.' in i or
+         #TODO: find a better way to exclude deploy_libs from this.
+         (i.endswith('.so') and not i.startswith('deploy_libs/')) or
          i.endswith('.dll') or
          i.endswith('.dylib') or
          'libpandagl' in i or
diff --git a/makepanda/makepanda.py b/makepanda/makepanda.py
index 7d6d1fae69..e7502a7828 100755
--- a/makepanda/makepanda.py
+++ b/makepanda/makepanda.py
@@ -6394,6 +6394,7 @@ if PkgSkip("PYTHON") == 0:
         # Setup rpath so libs can be found in the same directory as the deployed game
         LibName('DEPLOYSTUB', "-Wl,-rpath,\$ORIGIN")
         LibName('DEPLOYSTUB', "-Wl,-z,origin")
+        LibName('DEPLOYSTUB', "-rdynamic")
     TargetAdd('deploy-stub.exe', input='deploy-stub.obj')
     if GetTarget() == 'windows':
         TargetAdd('deploy-stub.exe', input='frozen_dllmain.obj')