diff --git a/NEWS b/NEWS
index 3e5b23c4d2e..12a6eb7fb9c 100644
--- a/NEWS
+++ b/NEWS
@@ -38,4 +38,7 @@ PHP                                                                        NEWS
   . Fixed bug #76737 (Unserialized reflection objects are broken, they
     shouldn't be serializable). (Nikita)
 
+- Tidy:
+  . Added TIDY_TAG_* constants for HTML5 elements. (cmb)
+
 <<< NOTE: Insert NEWS from last stable release here prior to actual release! >>>
diff --git a/UPGRADING b/UPGRADING
index caebb748ea2..55c20452eab 100644
--- a/UPGRADING
+++ b/UPGRADING
@@ -122,6 +122,36 @@ PHP 7.4 UPGRADE NOTES
 10. New Global Constants
 ========================================
 
+- Tidy:
+  . TIDY_TAG_ARTICLE
+  . TIDY_TAG_ASIDE
+  . TIDY_TAG_AUDIO
+  . TIDY_TAG_BDI
+  . TIDY_TAG_CANVAS
+  . TIDY_TAG_COMMAND
+  . TIDY_TAG_DATALIST
+  . TIDY_TAG_DETAILS
+  . TIDY_TAG_DIALOG
+  . TIDY_TAG_FIGCAPTION
+  . TIDY_TAG_FIGURE
+  . TIDY_TAG_FOOTER
+  . TIDY_TAG_HEADER
+  . TIDY_TAG_HGROUP
+  . TIDY_TAG_MAIN
+  . TIDY_TAG_MARK
+  . TIDY_TAG_MENUITEM
+  . TIDY_TAG_METER
+  . TIDY_TAG_NAV
+  . TIDY_TAG_OUTPUT
+  . TIDY_TAG_PROGRESS
+  . TIDY_TAG_SECTION
+  . TIDY_TAG_SOURCE
+  . TIDY_TAG_SUMMARY
+  . TIDY_TAG_TEMPLATE
+  . TIDY_TAG_TIME
+  . TIDY_TAG_TRACK
+  . TIDY_TAG_VIDEO
+
 ========================================
 11. Changes to INI File Handling
 ========================================
diff --git a/ext/tidy/tidy.c b/ext/tidy/tidy.c
index 0fde23cb11b..9cb63a0d4d3 100644
--- a/ext/tidy/tidy.c
+++ b/ext/tidy/tidy.c
@@ -2021,6 +2021,36 @@ static void _php_tidy_register_tags(INIT_FUNC_ARGS)
 	TIDY_TAG_CONST(VAR);
 	TIDY_TAG_CONST(WBR);
 	TIDY_TAG_CONST(XMP);
+# if HAVE_TIDYBUFFIO_H
+	TIDY_TAG_CONST(ARTICLE);
+	TIDY_TAG_CONST(ASIDE);
+	TIDY_TAG_CONST(AUDIO);
+	TIDY_TAG_CONST(BDI);
+	TIDY_TAG_CONST(CANVAS);
+	TIDY_TAG_CONST(COMMAND);
+	TIDY_TAG_CONST(DATALIST);
+	TIDY_TAG_CONST(DETAILS);
+	TIDY_TAG_CONST(DIALOG);
+	TIDY_TAG_CONST(FIGCAPTION);
+	TIDY_TAG_CONST(FIGURE);
+	TIDY_TAG_CONST(FOOTER);
+	TIDY_TAG_CONST(HEADER);
+	TIDY_TAG_CONST(HGROUP);
+	TIDY_TAG_CONST(MAIN);
+	TIDY_TAG_CONST(MARK);
+	TIDY_TAG_CONST(MENUITEM);
+	TIDY_TAG_CONST(METER);
+	TIDY_TAG_CONST(NAV);
+	TIDY_TAG_CONST(OUTPUT);
+	TIDY_TAG_CONST(PROGRESS);
+	TIDY_TAG_CONST(SECTION);
+	TIDY_TAG_CONST(SOURCE);
+	TIDY_TAG_CONST(SUMMARY);
+	TIDY_TAG_CONST(TEMPLATE);
+	TIDY_TAG_CONST(TIME);
+	TIDY_TAG_CONST(TRACK);
+	TIDY_TAG_CONST(VIDEO);
+# endif
 }
 
 #endif