--- a/langtools/src/share/classes/com/sun/tools/javac/comp/Enter.java	Mon Sep 16 14:13:44 2013 +0200
+++ b/langtools/src/share/classes/com/sun/tools/javac/comp/Enter.java	Tue Sep 17 14:17:13 2013 -0700
@@ -288,7 +288,9 @@
                                                              JavaFileObject.Kind.SOURCE);
         if (tree.pid != null) {
             tree.packge = reader.enterPackage(TreeInfo.fullName(tree.pid));
-            if (tree.packageAnnotations.nonEmpty() || pkginfoOpt == PkgInfo.ALWAYS) {
+            if (tree.packageAnnotations.nonEmpty()
+                    || pkginfoOpt == PkgInfo.ALWAYS
+                    || tree.docComments != null) {
                 if (isPkgInfo) {
                     addEnv = true;
                 } else if (tree.packageAnnotations.nonEmpty()){