diff --git a/direct/src/dist/commands.py b/direct/src/dist/commands.py
index 44243ee8b7..2619cac2ad 100644
--- a/direct/src/dist/commands.py
+++ b/direct/src/dist/commands.py
@@ -969,7 +969,7 @@ class build_apps(setuptools.Command):
                 # Remove python version string
                 if sys.version_info >= (3, 0):
                     parts = basename.split('.')
-                    if len(parts) >= 3 and '-' in parts[-2]:
+                    if len(parts) >= 3 and ('-' in parts[-2] or parts[-2] == 'abi' + str(sys.version_info[0])):
                         parts = parts[:-2] + parts[-1:]
                         basename = '.'.join(parts)