--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/Configuration.java	Sat Jul 12 07:32:28 2014 -0700
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/Configuration.java	Sun Jun 15 08:41:57 2014 -0700
@@ -140,7 +140,7 @@
     /**
      * The meta tag keywords instance.
      */
-    public final MetaKeywords metakeywords = new MetaKeywords(this);
+    public final MetaKeywords metakeywords;
 
     /**
      * The list of doc-file subdirectories to exclude
@@ -158,6 +158,10 @@
     public RootDoc root;
 
     /**
+     * An utility class for commonly used helpers
+     */
+    public Utils utils;
+    /**
      * Destination directory name, in which doclet will generate the entire
      * documentation. Default is current directory.
      */
@@ -310,6 +314,8 @@
         excludedDocFileDirs = new HashSet<>();
         excludedQualifiers = new HashSet<>();
         setTabWidth(DocletConstants.DEFAULT_TAB_STOP_LENGTH);
+        utils = new Utils();
+        metakeywords = new MetaKeywords(this);
     }
 
     /**
@@ -397,7 +403,7 @@
             interimResults.put(p, new ArrayList<PackageDoc>());
 
         for (PackageDoc pkg: packages) {
-            if (nodeprecated && Util.isDeprecated(pkg)) {
+            if (nodeprecated && utils.isDeprecated(pkg)) {
                 continue;
             }
             // the getProfile method takes a type name, not a package name,
@@ -933,7 +939,7 @@
         if (!nodeprecated) {
             return true;
         }
-        return !(Util.isDeprecated(cd) || Util.isDeprecated(cd.containingPackage()));
+        return !(utils.isDeprecated(cd) || utils.isDeprecated(cd.containingPackage()));
     }
 
     /**