diff --git a/checkstyle/plugin.jelly b/checkstyle/plugin.jelly
index ec98210a..8da1aef0 100644
--- a/checkstyle/plugin.jelly
+++ b/checkstyle/plugin.jelly
@@ -71,8 +71,7 @@
         </j:otherwise>
       </j:choose>
 
-      <ant:taskdef name="checkstyle"
-        classname="com.puppycrawl.tools.checkstyle.CheckStyleTask">
+      <ant:taskdef resource="checkstyletask.properties">
         <ant:classpath>
           <ant:pathelement location="${plugin.getDependencyPath('checkstyle:checkstyle')}"/>
           <ant:pathelement location="${plugin.getDependencyPath('checkstyle:checkstyle-optional')}"/>
diff --git a/checkstyle/project.xml b/checkstyle/project.xml
index 92994b63..a1da764d 100644
--- a/checkstyle/project.xml
+++ b/checkstyle/project.xml
@@ -140,41 +140,26 @@
       <groupId>antlr</groupId>
       <artifactId>antlr</artifactId>
       <version>2.7.5</version>
-      <properties>
-        <classloader>root</classloader>
-      </properties>
     </dependency>
     <dependency>
       <groupId>checkstyle</groupId>
       <artifactId>checkstyle</artifactId>
       <version>4.0-beta1</version>
-      <properties>
-        <classloader>root</classloader>
-      </properties>
     </dependency>
     <dependency>
       <groupId>checkstyle</groupId>
       <artifactId>checkstyle-optional</artifactId>
       <version>4.0-beta1</version>
-      <properties>
-        <classloader>root</classloader>
-      </properties>
     </dependency>
     <dependency>
       <groupId>regexp</groupId>
       <artifactId>regexp</artifactId>
       <version>1.3</version>
-      <properties>
-        <classloader>root</classloader>
-      </properties>
     </dependency>
     <dependency>
       <groupId>commons-beanutils</groupId>
       <artifactId>commons-beanutils-core</artifactId>
       <version>1.7.0</version>
-      <properties>
-        <classloader>root</classloader>
-      </properties>
     </dependency>
   </dependencies>
 </project>
diff --git a/checkstyle/xdocs/changes.xml b/checkstyle/xdocs/changes.xml
index f9c375ab..25eff733 100644
--- a/checkstyle/xdocs/changes.xml
+++ b/checkstyle/xdocs/changes.xml
@@ -26,7 +26,9 @@
   </properties>
   <body>
     <release version="3.0-SNAPSHOT" date="in CVS">
+      <action dev="carlos" type="update">Support for Java5</action>
       <action dev="carlos" type="update">Upgraded to checkstyle 4.0beta1</action>
+      <action dev="carlos" type="fix">Remove deprecated use of root classloader</action>
     </release>
     <release version="2.5" date="2004-10-12">
       <action dev="vmassol" type="add">Added new