diff --git a/dtool/Config.cmake b/dtool/Config.cmake
index 67ea64c9ce..fbe2d24836 100644
--- a/dtool/Config.cmake
+++ b/dtool/Config.cmake
@@ -265,7 +265,7 @@ if(BUILD_INTERROGATE)
     panda3d-interrogate
 
     GIT_REPOSITORY https://github.com/panda3d/interrogate.git
-    GIT_TAG d2844d994fcc465a4e22b10001d3ac5c4012b814
+    GIT_TAG 502b4806427f456e5fdbf4f98f271f89622a8a9c
 
     PREFIX ${_interrogate_dir}
     CMAKE_ARGS
diff --git a/dtool/src/interrogatedb/py_panda.h b/dtool/src/interrogatedb/py_panda.h
index d57af784f7..4b28908b9a 100644
--- a/dtool/src/interrogatedb/py_panda.h
+++ b/dtool/src/interrogatedb/py_panda.h
@@ -235,6 +235,7 @@ EXPCL_PYPANDA PyObject *Dtool_Raise_AssertionError();
 EXPCL_PYPANDA PyObject *Dtool_Raise_TypeError(const char *message);
 EXPCL_PYPANDA PyObject *Dtool_Raise_ArgTypeError(PyObject *obj, int param, const char *function_name, const char *type_name);
 EXPCL_PYPANDA PyObject *Dtool_Raise_AttributeError(PyObject *obj, const char *attribute);
+EXPCL_PYPANDA int Dtool_Raise_CantDeleteAttributeError(const char *attribute);
 
 EXPCL_PYPANDA PyObject *_Dtool_Raise_BadArgumentsError();
 EXPCL_PYPANDA PyObject *_Dtool_Raise_BadArgumentsError(const char *message);
diff --git a/makepanda/makepandacore.py b/makepanda/makepandacore.py
index c3c101486d..cddf8f5e4a 100644
--- a/makepanda/makepandacore.py
+++ b/makepanda/makepandacore.py
@@ -589,8 +589,8 @@ def GetInterrogateDir():
             return INTERROGATE_DIR
 
         dir = os.path.join(GetOutputDir(), "tmp", "interrogate")
-        if not os.path.isdir(os.path.join(dir, "panda3d_interrogate-0.5.0.dist-info")):
-            oscmd("\"%s\" -m pip install --force-reinstall --upgrade -t \"%s\" panda3d-interrogate==0.5.0" % (sys.executable, dir))
+        if not os.path.isdir(os.path.join(dir, "panda3d_interrogate-0.6.0.dist-info")):
+            oscmd("\"%s\" -m pip install --force-reinstall --upgrade -t \"%s\" panda3d-interrogate==0.6.0" % (sys.executable, dir))
 
         INTERROGATE_DIR = dir