diff -r 74cd21f2c2fe -r 7a9ef837e57f src/share/classes/com/sun/tools/doclets/formats/html/SerializedFormWriterImpl.java
--- a/src/share/classes/com/sun/tools/doclets/formats/html/SerializedFormWriterImpl.java	Tue May 14 10:14:52 2013 -0700
+++ b/src/share/classes/com/sun/tools/doclets/formats/html/SerializedFormWriterImpl.java	Tue May 14 10:14:52 2013 -0700
@@ -127,10 +127,10 @@
      * @return a content tree for the class header
      */
     public Content getClassHeader(ClassDoc classDoc) {
-        String classLink = (classDoc.isPublic() || classDoc.isProtected()) ?
+        Content classLink = (classDoc.isPublic() || classDoc.isProtected()) ?
             getLink(new LinkInfoImpl(configuration, classDoc,
-            configuration.getClassName(classDoc))).toString() :
-            classDoc.qualifiedName();
+            configuration.getClassName(classDoc))) :
+            new StringContent(classDoc.qualifiedName());
         Content li = HtmlTree.LI(HtmlStyle.blockList, getMarkerAnchor(
                 classDoc.qualifiedName()));
         String superClassLink =
@@ -143,9 +143,9 @@
         //Print the heading.
         String className = superClassLink == null ?
             configuration.getText(
-            "doclet.Class_0_implements_serializable", classLink) :
+            "doclet.Class_0_implements_serializable", classLink.toString()) :
             configuration.getText(
-            "doclet.Class_0_extends_implements_serializable", classLink,
+            "doclet.Class_0_extends_implements_serializable", classLink.toString(),
             superClassLink);
         Content classNameContent = new RawHtml(className);
         li.addContent(HtmlTree.HEADING(HtmlConstants.SERIALIZED_MEMBER_HEADING,