--- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/ConstantsSummaryBuilder.java	Tue Mar 15 13:48:30 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/ConstantsSummaryBuilder.java	Thu Mar 17 19:04:28 2016 +0000
@@ -200,11 +200,10 @@
      * @param summariesTree the tree to which the package header will be added
      */
     public void buildPackageHeader(XMLNode node, Content summariesTree) {
-        String parsedPackageName = utils.parsePackageName(currentPackage);
-        PackageElement p = utils.elementUtils.getPackageElement(parsedPackageName);
-        if (!printedPackageHeaders.contains(p)) {
+        PackageElement abbrevPkg = configuration.workArounds.getAbbreviatedPackageElement(currentPackage);
+        if (!printedPackageHeaders.contains(abbrevPkg)) {
             writer.addPackageName(currentPackage, summariesTree, first);
-            printedPackageHeaders.add(p);
+            printedPackageHeaders.add(abbrevPkg);
         }
     }