diff --git a/build.xml b/build.xml
index ef5d61dda..61b3bf7e4 100644
--- a/build.xml
+++ b/build.xml
@@ -314,6 +314,25 @@
           />
   </target>
 
+  <target name="checkstyle.sun_checks" depends="compile.checkstyle"
+          description="Runs checkstyle using sun_checks.xml">
+    <taskdef name="checkstyle"
+             classname="com.puppycrawl.tools.checkstyle.CheckStyleTask">
+      <classpath refid="run.classpath"/>
+    </taskdef>
+
+    <property name="check.config" location="sun_checks.xml"/>
+    <checkstyle config="${check.config}"
+                failOnViolation="true"
+                >
+      <fileset dir="src/checkstyle"
+               includes="**/*.java,**/*.properties"
+               excludes="**/Generated*.java,**/gui/*"/>
+      <formatter type="plain"/>
+      <classpath refid="run.classpath"/>
+    </checkstyle>
+  </target>
+
   <target name="checkstyle.style" depends="compile.checkstyle"
           description="Runs checkstyle against it's own sources to test generation of error reports">
     <taskdef name="checkstyle"
diff --git a/sun_checks.xml b/sun_checks.xml
index b0f098c42..af8de151e 100755
--- a/sun_checks.xml
+++ b/sun_checks.xml
@@ -32,9 +32,9 @@
 
 <module name="Checker">
 
-    <!-- Checks that a package.html file exists for each package.     -->
-    <!-- See http://checkstyle.sf.net/config_javadoc.html#PackageHtml -->
-    <module name="PackageHtml"/>
+    <!-- Checks that a package-info.java file exists for each package.     -->
+    <!-- See http://checkstyle.sf.net/config_javadoc.html#JavadocPackage -->
+    <module name="JavadocPackage"/>
 
     <!-- Checks whether files end with a new line.                        -->
     <!-- See http://checkstyle.sf.net/config_misc.html#NewlineAtEndOfFile -->