diff --git a/makepanda/makepandacore.py b/makepanda/makepandacore.py
index fb53058da9..5b0cf6601b 100644
--- a/makepanda/makepandacore.py
+++ b/makepanda/makepandacore.py
@@ -3365,10 +3365,12 @@ def GetExtensionSuffix():
         else:
             dllext = ''
 
+        gil_disabled = locations.get_config_var("Py_GIL_DISABLED")
+        suffix = 't' if gil_disabled and int(gil_disabled) else ''
         if GetTargetArch() == 'x64':
-            return dllext + '.cp%d%d-win_amd64.pyd' % (sys.version_info[:2])
+            return dllext + '.cp%d%d%s-win_amd64.pyd' % (sys.version_info[0], sys.version_info[1], suffix)
         else:
-            return dllext + '.cp%d%d-win32.pyd' % (sys.version_info[:2])
+            return dllext + '.cp%d%d%s-win32.pyd' % (sys.version_info[0], sys.version_info[1], suffix)
     elif target == 'emscripten':
         return '.so'
     elif CrossCompiling():
diff --git a/makepanda/makewheel.py b/makepanda/makewheel.py
index fc984e1bb1..579c3e2e9e 100644
--- a/makepanda/makewheel.py
+++ b/makepanda/makewheel.py
@@ -19,7 +19,15 @@ from sysconfig import get_platform
 
 
 def get_abi_tag():
-    return ('cp%d%d' % sys.version_info[:2]) + getattr(sys, 'abiflags', '')
+    ver = 'cp%d%d' % sys.version_info[:2]
+    if hasattr(sys, 'abiflags'):
+        return ver + sys.abiflags
+
+    gil_disabled = locations.get_config_var("Py_GIL_DISABLED")
+    if gil_disabled and int(gil_disabled):
+        return ver + 't'
+
+    return ver
 
 
 def is_exe_file(path):