diff --git a/Lib/test/test_genericalias.py b/Lib/test/test_genericalias.py
index bf600a0f4d1834..0dfbaa7ca60e84 100644
--- a/Lib/test/test_genericalias.py
+++ b/Lib/test/test_genericalias.py
@@ -94,7 +94,7 @@
 
 class BaseTest(unittest.TestCase):
     """Test basics."""
-    generic_types = [type, tuple, list, dict, set, frozenset, enumerate,
+    generic_types = [type, tuple, list, dict, set, frozenset, enumerate, map,
                      defaultdict, deque,
                      SequenceMatcher,
                      dircmp,
diff --git a/Misc/NEWS.d/next/Core and Builtins/2023-09-01-16-00-12.gh-issue-108761.V2zSwz.rst b/Misc/NEWS.d/next/Core and Builtins/2023-09-01-16-00-12.gh-issue-108761.V2zSwz.rst
new file mode 100644
index 00000000000000..c2b9a1f5f0d230
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2023-09-01-16-00-12.gh-issue-108761.V2zSwz.rst	
@@ -0,0 +1 @@
+Add :pep:`585` support for builtin :class:`map`.
diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c
index 971067e2d4fcc1..754bebd68ae3a8 100644
--- a/Python/bltinmodule.c
+++ b/Python/bltinmodule.c
@@ -1440,6 +1440,8 @@ map_reduce(mapobject *lz, PyObject *Py_UNUSED(ignored))
 
 static PyMethodDef map_methods[] = {
     {"__reduce__", _PyCFunction_CAST(map_reduce), METH_NOARGS, reduce_doc},
+    {"__class_getitem__", Py_GenericAlias, METH_O|METH_CLASS,
+     PyDoc_STR("See PEP 585")},
     {NULL,           NULL}           /* sentinel */
 };