diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 4020a7bd..55df280a 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -3,6 +3,12 @@ Changelog
 
 This document describes changes between each past release.
 
+Unreleased
+==========
+
+- Renamed toolbar elements (namely ``formatselect`` is now ``blocks``) to follow
+  TinyMCE 6 renames (#470).
+
 4.0.0 (2024-03-27)
 ==================
 
diff --git a/docs/installation.rst b/docs/installation.rst
index f0109a48..d20c13bc 100644
--- a/docs/installation.rst
+++ b/docs/installation.rst
@@ -120,7 +120,7 @@ file.
         "plugins": "advlist,autolink,lists,link,image,charmap,preview,anchor,"
         "searchreplace,visualblocks,code,fullscreen,insertdatetime,media,table,"
         "code,help,wordcount",
-        "toolbar": "undo redo | formatselect | "
+        "toolbar": "undo redo | blocks | "
         "bold italic backcolor | alignleft aligncenter "
         "alignright alignjustify | bullist numlist outdent indent | "
         "removeformat | help",
@@ -149,7 +149,7 @@ Example::
       "menubar": "file edit view insert format tools table help",
       "plugins": "advlist autolink lists link image charmap preview anchor searchreplace visualblocks code "
       "fullscreen insertdatetime media table code help wordcount",
-      "toolbar": "undo redo | bold italic underline strikethrough | fontselect fontsizeselect formatselect | alignleft "
+      "toolbar": "undo redo | bold italic underline strikethrough | fontfamily fontsize blocks | alignleft "
       "aligncenter alignright alignjustify | outdent indent |  numlist bullist checklist | forecolor "
       "backcolor casechange permanentpen formatpainter removeformat | pagebreak | charmap emoticons | "
       "fullscreen  preview save print | insertfile image media pageembed template link anchor codesample | "
diff --git a/tests/settings.py b/tests/settings.py
index 6ede54cc..976cf166 100644
--- a/tests/settings.py
+++ b/tests/settings.py
@@ -81,7 +81,7 @@
     "plugins": "advlist,autolink,lists,link,image,charmap,preview,anchor,"
     "searchreplace,visualblocks,code,fullscreen,insertdatetime,media,table,"
     "code,help,wordcount",
-    "toolbar": "undo redo | formatselect | "
+    "toolbar": "undo redo | blocks | "
     "bold italic backcolor | alignleft aligncenter "
     "alignright alignjustify | bullist numlist outdent indent | "
     "removeformat | help",
diff --git a/tinymce/settings.py b/tinymce/settings.py
index d8b66ac8..645dd083 100644
--- a/tinymce/settings.py
+++ b/tinymce/settings.py
@@ -12,7 +12,7 @@
         "plugins": "advlist,autolink,lists,link,image,charmap,preview,anchor,"
         "searchreplace,visualblocks,code,fullscreen,insertdatetime,media,table,"
         "help,wordcount",
-        "toolbar": "undo redo | formatselect | "
+        "toolbar": "undo redo | blocks | "
         "bold italic backcolor | alignleft aligncenter "
         "alignright alignjustify | bullist numlist outdent indent | "
         "removeformat | help",