diff --git a/makepanda/makepandacore.py b/makepanda/makepandacore.py
index 890b55b83b..932210f9c7 100644
--- a/makepanda/makepandacore.py
+++ b/makepanda/makepandacore.py
@@ -3393,6 +3393,9 @@ def GetPythonABI():
 
     soabi = 'cpython-%d%d' % (sys.version_info[:2])
 
+    if sys.version_info >= (3, 8):
+        return soabi
+
     debug_flag = sysconfig.get_config_var('Py_DEBUG')
     if (debug_flag is None and hasattr(sys, 'gettotalrefcount')) or debug_flag:
         soabi += 'd'
diff --git a/makepanda/makewheel.py b/makepanda/makewheel.py
index 97177345fc..f9b8bb1bec 100644
--- a/makepanda/makewheel.py
+++ b/makepanda/makewheel.py
@@ -29,6 +29,9 @@ def get_abi_tag():
 
     soabi = 'cp%d%d' % (sys.version_info[:2])
 
+    if sys.version_info >= (3, 8):
+        return soabi
+
     debug_flag = get_config_var('Py_DEBUG')
     if (debug_flag is None and hasattr(sys, 'gettotalrefcount')) or debug_flag:
         soabi += 'd'