diff --git a/src/testdir/test_vim9_func.vim b/src/testdir/test_vim9_func.vim
index 925e7c8..de09baa 100644
--- a/src/testdir/test_vim9_func.vim
+++ b/src/testdir/test_vim9_func.vim
@@ -90,6 +90,24 @@
   CheckScriptFailureList(lines, ['E1012:', 'E1191:'])
 enddef
 
+def Test_wrong_function_name()
+  var lines =<< trim END
+      vim9script
+      func _Foo()
+        echo 'foo'
+      endfunc
+  END
+  CheckScriptFailure(lines, 'E128:')
+
+  lines =<< trim END
+      vim9script
+      def _Foo()
+        echo 'foo'
+      enddef
+  END
+  CheckScriptFailure(lines, 'E128:')
+enddef
+
 def Test_autoload_name_mismatch()
   var dir = 'Xdir/autoload'
   mkdir(dir, 'p')
diff --git a/src/userfunc.c b/src/userfunc.c
index 56b7df3..e2e745c 100644
--- a/src/userfunc.c
+++ b/src/userfunc.c
@@ -3595,7 +3595,8 @@
 		lead += (int)STRLEN(sid_buf);
 	}
     }
-    else if (!(flags & TFN_INT) && builtin_function(lv.ll_name, len))
+    else if (!(flags & TFN_INT) && (builtin_function(lv.ll_name, len)
+				   || (in_vim9script() && *lv.ll_name == '_')))
     {
 	semsg(_("E128: Function name must start with a capital or \"s:\": %s"),
 								       start);
diff --git a/src/version.c b/src/version.c
index 0c3c887..77456bb 100644
--- a/src/version.c
+++ b/src/version.c
@@ -756,6 +756,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    3031,
+/**/
     3030,
 /**/
     3029,