diff --git a/checkstyle/project.xml b/checkstyle/project.xml
index 0e728994..ea478f2c 100644
--- a/checkstyle/project.xml
+++ b/checkstyle/project.xml
@@ -23,7 +23,7 @@
   <pomVersion>3</pomVersion>
   <id>maven-checkstyle-plugin</id>
   <name>Maven Checkstyle Plugin</name>
-  <currentVersion>2.5</currentVersion>
+  <currentVersion>3.0-SNAPSHOT</currentVersion>
   <description/>
   <shortDescription>Produce Checkstyle report</shortDescription>
   <url>http://maven.apache.org/reference/plugins/checkstyle/</url>
@@ -118,6 +118,16 @@
       </roles>
       <timezone>+1</timezone>
     </developer>
+    <developer>
+      <name>Carlos Sanchez</name>
+      <id>carlos</id>
+      <email>carlos@apache.org</email>
+      <organization/>
+      <roles>
+        <role>Developer</role>
+      </roles>
+      <timezone>+1</timezone>
+    </developer>
   </developers>
   <contributors>
     <contributor>
@@ -129,7 +139,7 @@
     <dependency>
       <groupId>antlr</groupId>
       <artifactId>antlr</artifactId>
-      <version>2.7.2</version>
+      <version>2.7.5</version>
       <properties>
         <classloader>root</classloader>
       </properties>
@@ -137,7 +147,7 @@
     <dependency>
       <groupId>checkstyle</groupId>
       <artifactId>checkstyle</artifactId>
-      <version>3.4</version>
+      <version>4.0-beta1</version>
       <properties>
         <classloader>root</classloader>
       </properties>
@@ -145,7 +155,7 @@
     <dependency>
       <groupId>checkstyle</groupId>
       <artifactId>checkstyle-optional</artifactId>
-      <version>3.4</version>
+      <version>4.0-beta1</version>
       <properties>
         <classloader>root</classloader>
       </properties>
@@ -161,7 +171,7 @@
     <dependency>
       <groupId>commons-beanutils</groupId>
       <artifactId>commons-beanutils</artifactId>
-      <version>1.6.1</version>
+      <version>1.7.0</version>
       <properties>
         <classloader>root</classloader>
       </properties>
diff --git a/checkstyle/src/plugin-resources/sun_checks.xml b/checkstyle/src/plugin-resources/sun_checks.xml
index 0c8ef4f3..9065a34b 100644
--- a/checkstyle/src/plugin-resources/sun_checks.xml
+++ b/checkstyle/src/plugin-resources/sun_checks.xml
@@ -18,8 +18,8 @@
  -->
 
 <!DOCTYPE module PUBLIC
-    "-//Puppy Crawl//DTD Check Configuration 1.1//EN"
-    "http://www.puppycrawl.com/dtds/configuration_1_1.dtd">
+    "-//Puppy Crawl//DTD Check Configuration 1.2//EN"
+    "http://www.puppycrawl.com/dtds/configuration_1_2.dtd">
 
 <!--
 
@@ -88,9 +88,9 @@
         <module name="TypeName"/>
 
 
-        <!-- Checks for Headers                              -->
-        <!-- See http://checkstyle.sf.net/config_header.html -->
-        <module name="Header">
+        <!-- Checks for Headers                                -->
+        <!-- See http://checkstyle.sf.net/config_header.html   -->
+        <!-- <module name="Header">                            -->
             <!-- The follow property value demonstrates the ability     -->
             <!-- to have access to ANT properties. In this case it uses -->
             <!-- the ${basedir} property to allow Checkstyle to be run  -->
@@ -100,8 +100,7 @@
             <!-- <property                                              -->
             <!--     name="headerFile"                                  -->
             <!--     value="${basedir}/java.header"/>                   -->
-            <property name="headerFile" value="${checkstyle.header.file}"/>
-        </module>
+        <!-- </module> -->
 
         <!-- Following interprets the header file as regular expressions. -->
         <!-- <module name="RegexpHeader"/>                                -->
@@ -126,6 +125,7 @@
         <!-- Checks for whitespace                               -->
         <!-- See http://checkstyle.sf.net/config_whitespace.html -->
         <module name="EmptyForIteratorPad"/>
+        <module name="MethodParamPad"/>
         <module name="NoWhitespaceAfter"/>
         <module name="NoWhitespaceBefore"/>
         <module name="OperatorWrap"/>
diff --git a/checkstyle/xdocs/changes.xml b/checkstyle/xdocs/changes.xml
index 00fab0bf..f9c375ab 100644
--- a/checkstyle/xdocs/changes.xml
+++ b/checkstyle/xdocs/changes.xml
@@ -25,6 +25,9 @@
     <author email="evenisse@ifrance.com">Emmanuel Venisse</author>
   </properties>
   <body>
+    <release version="3.0-SNAPSHOT" date="in CVS">
+      <action dev="carlos" type="update">Upgraded to checkstyle 4.0beta1</action>
+    </release>
     <release version="2.5" date="2004-10-12">
       <action dev="vmassol" type="add">Added new
         <code>maven.checkstyle.suppressions.file</code>property.