diff --git a/ext/tidy/config.m4 b/ext/tidy/config.m4
index bc0976a1dd9b3..569cb3672944b 100644
--- a/ext/tidy/config.m4
+++ b/ext/tidy/config.m4
@@ -62,6 +62,11 @@ if test "$PHP_TIDY" != "no"; then
     AC_DEFINE(HAVE_TIDYRELEASEDATE,1,[ ])
   ], [], [])
 
+  PHP_CHECK_LIBRARY($TIDY_LIB_NAME,tidyOptGetCategory,
+  [
+    AC_DEFINE(HAVE_TIDYOPTGETCATEGORY,1,[ ])
+  ], [], [])
+
   PHP_ADD_LIBRARY_WITH_PATH($TIDY_LIB_NAME, $TIDY_LIBDIR, TIDY_SHARED_LIBADD)
   PHP_ADD_INCLUDE($TIDY_INCDIR)
 
diff --git a/ext/tidy/tidy.c b/ext/tidy/tidy.c
index 46dd637f40e54..a42e2bc203770 100644
--- a/ext/tidy/tidy.c
+++ b/ext/tidy/tidy.c
@@ -232,7 +232,11 @@ static int _php_tidy_set_tidy_opt(TidyDoc doc, char *optname, zval *value)
 		return FAILURE;
 	}
 
+#if defined(HAVE_TIDYOPTGETCATEGORY)
+	if (tidyOptGetCategory(opt) == TidyInternalCategory) {
+#else
 	if (tidyOptIsReadOnly(opt)) {
+#endif
 		php_error_docref(NULL, E_WARNING, "Attempting to set read-only option \"%s\"", optname);
 		return FAILURE;
 	}