diff --git a/.github/workflows/dist.yml b/.github/workflows/dist.yml
index 343d8bf4..7d152b81 100644
--- a/.github/workflows/dist.yml
+++ b/.github/workflows/dist.yml
@@ -96,6 +96,7 @@ jobs:
         - '3.10'
         - '3.11'
         - '3.12'
+        - '3.13'
         architecture: [x86, x64]
         exclude:
         - os: macos-12
diff --git a/robotpy_build/autowrap/header.cpp.j2 b/robotpy_build/autowrap/header.cpp.j2
index dcb5e63f..565e0b60 100644
--- a/robotpy_build/autowrap/header.cpp.j2
+++ b/robotpy_build/autowrap/header.cpp.j2
@@ -42,10 +42,6 @@
   using namespace {{ ns }};
 {% endfor %}
 
-{% for cls in classes if cls.nodelete %}
-PYBIND11_TYPE_CASTER_BASE_HOLDER(typename {{ cls.full_cpp_name }}, std::unique_ptr<typename {{ cls.full_cpp_name }}, py::nodelete>);
-{% endfor %}
-
 
 struct rpybuild_{{ hname }}_initializer {
 
diff --git a/robotpy_build/include/gilsafe_object.h b/robotpy_build/include/gilsafe_object.h
index 1bfc861c..38906e45 100644
--- a/robotpy_build/include/gilsafe_object.h
+++ b/robotpy_build/include/gilsafe_object.h
@@ -6,7 +6,7 @@
 namespace py = pybind11;
 
 // Py_IsFinalizing is public API in 3.13
-#if PY_VERSION_HEX < 0x03130000
+#if PY_VERSION_HEX < 0x030D0000
 #define Py_IsFinalizing _Py_IsFinalizing
 #endif
 
diff --git a/robotpy_build/pybind11 b/robotpy_build/pybind11
index a5b0cdcb..d8b15411 160000
--- a/robotpy_build/pybind11
+++ b/robotpy_build/pybind11
@@ -1 +1 @@
-Subproject commit a5b0cdcb937b2853e012489633d692099dab7078
+Subproject commit d8b1541168e58444597f25e85e78356de9b67d34