diff --git a/NEWS b/NEWS
index 30ca4743e5c..d05ec59ad0d 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,8 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? Apr 2006, PHP 5.1.3
+- Fixed bug #37053 (html_errors with internal classes produces wrong links). 
+  (Tony)
 - Fixed bug #37046 (foreach breaks static scope). (Dmitry)
 - Fixed bug #37002 (Have to quote literals in INI when concatenating with
   vars). (Dmitry)
diff --git a/main/main.c b/main/main.c
index 05612e664ca..1bf2996b53a 100644
--- a/main/main.c
+++ b/main/main.c
@@ -509,7 +509,11 @@ PHPAPI void php_verror(const char *docref, const char *params, int type, const c
 
 	/* no docref given but function is known (the default) */
 	if (!docref && is_function) {
-		spprintf(&docref_buf, 0, "function.%s", function);
+		if (space[0] == '\0') {
+			spprintf(&docref_buf, 0, "function.%s", function);
+		} else {
+			spprintf(&docref_buf, 0, "function.%s-%s", class_name, function);
+		}
 		while((p = strchr(docref_buf, '_')) != NULL) {
 			*p = '-';
 		}