diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/TextBlockSupport.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/TextBlockSupport.java
index d099ceadba0..5112849d45f 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/TextBlockSupport.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/TextBlockSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -56,8 +56,8 @@ class TextBlockSupport {
         // No need to check indentation if opting out (last line is empty.)
         char lastChar = string.charAt(string.length() - 1);
         boolean optOut = lastChar == '\n' || lastChar == '\r';
-        // Split string based at line terminators.
-        String[] lines = string.split("\\R");
+        // Split string using JLS text block line terminators: CRLF, CR, or LF.
+        String[] lines = string.split("\\r\\n|\\r|\\n");
         int length = lines.length;
         // Extract last line.
         String lastLine = length == 0 ? "" : lines[length - 1];
diff --git a/test/langtools/tools/javac/TextBlockU2028.java b/test/langtools/tools/javac/TextBlockU2028.java
new file mode 100644
index 00000000000..a7abfe43263
--- /dev/null
+++ b/test/langtools/tools/javac/TextBlockU2028.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8380912
+ * @summary Verify that trailing whitespace warning is not reported for \u2028
+ *          inside text block content
+ * @library /tools/lib
+ * @modules
+ *      jdk.compiler/com.sun.tools.javac.api
+ *      jdk.compiler/com.sun.tools.javac.main
+ * @build toolbox.ToolBox toolbox.JavacTask
+ * @run junit TextBlockU2028
+ */
+
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+import toolbox.JavacTask;
+import toolbox.ToolBox;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInfo;
+
+public class TextBlockU2028 {
+    Path base;
+    ToolBox tb = new ToolBox();
+
+    @Test
+    void testNoFalseTrailingWhitespaceWarning() throws Exception {
+        Path classes = base.resolve("classes");
+        Files.createDirectories(classes);
+        new JavacTask(tb)
+                .options("-d", classes.toString(), "-Xlint:text-blocks", "-XDrawDiagnostics", "-Werror")
+                .sources("""
+                         public class Test {
+                             String s = \"\"\"
+                                        foo \\u2028 bar
+                                        \"\"\";
+                         }
+                         """)
+                .run()
+                .writeAll();
+    }
+
+    @BeforeEach
+    public void setUp(TestInfo info) {
+        base = Paths.get(".")
+                    .resolve(info.getTestMethod()
+                                 .orElseThrow()
+                                 .getName());
+    }
+}