diff -r 000000000000 -r 9a66ca7c79fa test/com/sun/javadoc/testSupplementary/TestSupplementary.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/com/sun/javadoc/testSupplementary/TestSupplementary.java	Sat Dec 01 00:00:00 2007 +0000
@@ -0,0 +1,77 @@
+/*
+ * Copyright 2003 Sun Microsystems, Inc.  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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/*
+ * @test
+ * @bug 4914724
+ * @summary Test to make sure that "see" tag and "serialField" tag handle supplementary
+ *    characters correctly.  This test case needs to be run in en_US locale.
+ * @author Naoto Sato
+ * @library ../lib/
+ * @build JavadocTester
+ * @build TestSupplementary
+ * @run main TestSupplementary
+ */
+
+public class TestSupplementary extends JavadocTester {
+
+    private static final String BUG_ID = "4914724";
+    private static final String[][] TEST = {
+        {WARNING_OUTPUT, "C.java:38: warning - Tag @see:illegal character: \"119040\" in \"C#method\ud834\udd00()"},
+        {WARNING_OUTPUT, "C.java:44: warning - illegal character \ud801 in @serialField tag: field\ud801\ud801 int."},
+        {WARNING_OUTPUT, "C.java:44: warning - illegal character \ud834\udd7b in @serialField tag: \ud834\udd7bfield int."},
+    };
+    private static final String[][] NEGATED_TEST = {
+        {WARNING_OUTPUT, "C.java:14: warning - Tag @see:illegal character"},
+        {WARNING_OUTPUT, "C.java:19: warning - Tag @see:illegal character"},
+        {WARNING_OUTPUT, "C.java:24: warning - Tag @see:illegal character"},
+        {WARNING_OUTPUT, "C.java:31: warning - illegal character"},
+    };
+    private static final String[] ARGS = new String[] {
+        "-locale", "en_US", "-d", BUG_ID, SRC_DIR + FS + "C.java"
+    };
+
+    /**
+     * The entry point of the test.
+     * @param args the array of command line arguments.
+     */
+    public static void main(String[] args) {
+        TestSupplementary tester = new TestSupplementary();
+        run(tester, ARGS, TEST, NEGATED_TEST);
+        tester.printSummary();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public String getBugId() {
+        return BUG_ID;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public String getBugName() {
+        return getClass().getName();
+    }
+}