diff --git a/checkstyle.xml b/checkstyle.xml
index 2564b15..8ce2d9d 100644
--- a/checkstyle.xml
+++ b/checkstyle.xml
@@ -27,7 +27,10 @@
   
       <!-- Checks that a package.html file exists for each package.     -->
       <!-- See http://checkstyle.sf.net/config_javadoc.html#PackageHtml -->
-      <module name="PackageHtml"/>
+      <module name="JavadocPackage">
+          <!-- setting allowLegacy means it will check for package.html instead of just package-info.java -->
+          <property name="allowLegacy" value="true"/>
+      </module>
   
       <!-- Checks whether files end with a new line.                        -->
       <!-- See http://checkstyle.sf.net/config_misc.html#NewlineAtEndOfFile -->
@@ -37,6 +40,21 @@
       <!-- See http://checkstyle.sf.net/config_misc.html#Translation -->
       <module name="Translation"/>
   
+      <module name="Header">
+          <property name="headerFile" value="${checkstyle.header.file}"/>
+      </module>
+
+      <module name="FileLength"/>
+
+      <module name="FileTabCharacter">
+          <property name="fileExtensions" value="java,xml"/>
+      </module>
+
+      <module name="RegexpSingleline">
+          <property name="format" value="\s+$"/>
+          <property name="message" value="Line has trailing spaces."/>
+      </module>
+
       <module name="TreeWalker">
   
           <!--property name="cacheFile" value="${checkstyle.cache.file}"/-->
@@ -44,9 +62,6 @@
           <!-- ************************************************************** -->
           <!-- Checks that are different from the sun coding conventions ones -->
           <!-- ************************************************************** -->
-          <module name="Header">
-              <property name="headerFile" value="${checkstyle.header.file}"/>
-          </module>
           <property name="tabWidth" value="4"/>
           <module name="LeftCurly">
             <property name="option" value="eol"/>
@@ -106,7 +121,6 @@
   
           <!-- Checks for Size Violations.                    -->
           <!-- See http://checkstyle.sf.net/config_sizes.html -->
-          <module name="FileLength"/>
           <module name="ParameterNumber"/>
   
   
@@ -116,7 +130,6 @@
           <module name="NoWhitespaceAfter"/>
           <module name="NoWhitespaceBefore"/>
           <!-- module name="OperatorWrap"/ -->
-          <module name="TabCharacter"/>
           <module name="WhitespaceAfter">
              <property name="tokens" value="COMMA, SEMI"/>
           </module>
@@ -167,10 +180,6 @@
           <!-- See http://checkstyle.sf.net/config_misc.html -->
           <module name="ArrayTypeStyle"/>
           <!-- module name="FinalParameters"/ -->
-          <module name="GenericIllegalRegexp">
-              <property name="format" value="\s+$"/>
-              <property name="message" value="Line has trailing spaces."/>
-          </module>
           <module name="TodoComment"/>
           <module name="UpperEll"/>
   
diff --git a/pom.xml b/pom.xml
index 75ca7dd..968016a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -233,7 +233,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-changes-plugin</artifactId>
-                <version>2.0</version>
+                <version>2.3</version>
                 <configuration>
                     <xmlPath>${basedir}/src/changes/changes.xml</xmlPath>
                     <issueLinkTemplate>%URL%/%ISSUE%</issueLinkTemplate>
@@ -250,7 +250,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-checkstyle-plugin</artifactId>
-                <version>2.1</version>
+                <version>2.6</version>
                 <configuration>
                     <configLocation>${basedir}/checkstyle.xml</configLocation>
                     <enableRulesSummary>false</enableRulesSummary>
@@ -283,8 +283,17 @@
             </plugin>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
+                <artifactId>cobertura-maven-plugin</artifactId>
+                <version>2.4</version>
+                <configuration>
+                    <threshold>Normal</threshold>
+                    <effort>Default</effort>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
                 <artifactId>findbugs-maven-plugin</artifactId>
-                <version>1.2</version>
+                <version>2.3.1</version>
                 <configuration>
                     <threshold>Normal</threshold>
                     <effort>Default</effort>
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index c37c344..c2f863b 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -117,9 +117,7 @@
       <action dev="germuska" type="update" issue="CHAIN-3">
          Decouple CatalogFactory lookup from LookupAction.
       </action>
-      <action dev="craigmcc" type="fix" issue="CHAIN-12">
-        <dueto name="Jeff Ramsdale"/>
-        <dueto name="Dennis Lundberg"/>
+      <action dev="craigmcc" type="fix" issue="CHAIN-12" due-to="Jeff Ramsdale and Dennis Lundberg">
          Make ContextBase live up to the Serializable contract that it inherits by virtue of extending HashMap.
       </action>
       <action dev="martinc" type="update">
@@ -137,9 +135,7 @@
       <action dev="germuska" type="add" issue="CHAIN-20">
          Add new  DispatchCommand.
       </action>
-      <action dev="jmitchell" type="fix" issue="CHAIN-6">
-        <dueto name="William Slough"/>
-        <dueto name="Sean Schofield"/>
+      <action dev="jmitchell" type="fix" issue="CHAIN-6" due-to="William Slough and Sean Schofield">
          CopyCommand does not work unless setValue is called.
       </action>
       <action dev="craigmcc" type="add" issue="CHAIN-19" due-to="Joe Germuska">