diff --git a/makepanda/makepackage.py b/makepanda/makepackage.py
index 6bfad076c6..17aa677329 100755
--- a/makepanda/makepackage.py
+++ b/makepanda/makepackage.py
@@ -795,7 +795,7 @@ def MakeInstallerFreeBSD(version, python_versions=[], **kwargs):
         oscmd("rm -f %s/tmp/python_dep" % outputdir)
 
         if "PYTHONVERSION" in SDK:
-            pyver_nodot = SDK["PYTHONVERSION"][6:].rstrip('dmu').replace('.', '')
+            pyver_nodot = SDK["PYTHONVERSION"][6:].rstrip('dmut').replace('.', '')
         else:
             pyver_nodot = "%d%d" % (sys.version_info[:2])
 
diff --git a/makepanda/makepandacore.py b/makepanda/makepandacore.py
index 486bd696fb..fb53058da9 100644
--- a/makepanda/makepandacore.py
+++ b/makepanda/makepandacore.py
@@ -3505,7 +3505,7 @@ def GetCurrentPythonVersionInfo():
         return
 
     return {
-        "version": SDK["PYTHONVERSION"][6:].rstrip('dmu'),
+        "version": SDK["PYTHONVERSION"][6:].rstrip('dmut'),
         "soabi": GetPythonABI(),
         "ext_suffix": GetExtensionSuffix(),
         "executable": sys.executable,
diff --git a/makepanda/makewheel.py b/makepanda/makewheel.py
index 3e56581549..fc984e1bb1 100644
--- a/makepanda/makewheel.py
+++ b/makepanda/makewheel.py
@@ -19,13 +19,7 @@ from sysconfig import get_platform
 
 
 def get_abi_tag():
-    soabi = get_config_var('SOABI')
-    if soabi and soabi.startswith('cpython-'):
-        return 'cp' + soabi.split('-')[1]
-    elif soabi:
-        return soabi.replace('.', '_').replace('-', '_')
-
-    return 'cp%d%d' % (sys.version_info[:2])
+    return ('cp%d%d' % sys.version_info[:2]) + getattr(sys, 'abiflags', '')
 
 
 def is_exe_file(path):