diff --git a/checkstyle.xml b/checkstyle.xml
index a88573a48..27a09f255 100644
--- a/checkstyle.xml
+++ b/checkstyle.xml
@@ -23,25 +23,52 @@
   <property name="localeLanguage" value="en"/>
 
   <module name="TreeWalker">
+   
     <!-- Verify that EVERY source file has the appropriate license -->
     <module name="Header">
       <property name="headerFile" value="license-header.txt"/>
       <property name="ignoreLines" value="2"/>
     </module>
 
+    <!-- Operator must be at end of wrapped line -->
     <module name="OperatorWrap">
       <property name="option" value="eol"/>
     </module>
+    
+    <!-- Interfaces must be types (not just constants) -->
+    <module name="InterfaceIsType"/>
 
-		<module name="JavadocType">
-  		<property name="versionFormat" value="\$Revision.*\$ \$Date.*\$"/>
-		</module>
+    <!-- Must have class / interface header comments including scm version -->
+	<module name="JavadocType">
+  	  <property name="versionFormat" value="\$Revision.*\$ \$Date.*\$"/>
+	</module>
 		
-		<module name="JavadocMethod">
-			<property name="allowUndeclaredRTE" value="true"/>
-		</module>
+     <!-- Require method javadocs, allow undeclared RTE -->
+	<module name="JavadocMethod">
+	  <property name="allowUndeclaredRTE" value="true"/>
+	</module>
 		
-		<module name="JavadocVariable"/>
+    <!-- Require field javadoc -->
+	<module name="JavadocVariable"/>
+		
+    <!-- No tabs allowed! -->
+	<module name="TabCharacter"/>
+	
+	<!-- No public fields -->
+	<module name="VisibilityModifier">
+       <property name="protectedAllowed" value="true"/>
+    </module>
+	
+	<!-- Require hash code override when equals is -->
+	<module name="EqualsHashCode"/>
+	
+	<!-- Disallow unecessary instantiantion of Boolean, String -->
+	<module name="IllegalInstantiation">
+      <property name="classes" value="java.lang.Boolean, java.lang.String"/>
+    </module>
   </module>
+  
+  <!-- Require package javadoc -->
+  <module name="PackageHtml"/>
 </module>
 
diff --git a/maven.xml b/maven.xml
index 7c6bac135..ae482ffe1 100644
--- a/maven.xml
+++ b/maven.xml
@@ -49,8 +49,13 @@
     <copy todir="${maven.dist.src.assembly.dir}">
       <fileset file='${basedir}/checkstyle.xml'/>
       <fileset file='${basedir}/license-header.txt'/>
+      <fileset file='${basedir}/build.properties.sample'/>
       <fileset file='${basedir}/NOTICE.txt'/>
       <fileset file='${basedir}/RELEASE-NOTES.txt'/>
+      <fileset file='${basedir}/release-notes.jsl'/>
+    </copy>
+    <copy todir="${maven.dist.src.assembly.dir}/xdocs">
+        <fileset dir="./xdocs"/>
     </copy>
     <delete dir="${maven.dist.src.assembly.dir}/src/experimental" />
     <move todir="${maven.dist.src.assembly.dir}-src">
diff --git a/project.properties b/project.properties
index 26e0d9eff..c546a00d5 100644
--- a/project.properties
+++ b/project.properties
@@ -14,6 +14,11 @@
 #
 ##
 # Properties that override Maven build defaults
+#
+# Note: To compile/jar under jdk 1.3 (to reproduce the math 1.1 release),
+# additional properties in build.properties.sample need to be set.
+# Settings below will compile with 1.3 source and target compiler settings
+# but will use the jdk used to launch maven.
 ##
 
 maven.changelog.factory=org.apache.maven.svnlib.SvnChangeLogFactory
@@ -38,7 +43,7 @@ maven.javadoc.links = http://java.sun.com/j2se/1.4.2/docs/api/,\
                       http://jakarta.apache.org/commons/collections/api/,\
                       http://jakarta.apache.org/commons/discovery/api/
 
-maven.changes.issue.template=http://issues.apache.org/bugzilla/show_bug.cgi?id=%ISSUE%
+maven.changes.issue.template=%URL%/show_bug.cgi?id=%ISSUE% 
 
 maven.jar.override = on
 maven.jar.clover = 1.3.2
diff --git a/project.xml b/project.xml
index 4f23e81c0..41d1c56b1 100644
--- a/project.xml
+++ b/project.xml
@@ -42,7 +42,7 @@
     </license>
   </licenses>
   <gumpRepositoryId>jakarta</gumpRepositoryId>
-  <issueTrackingUrl>http://issues.apache.org/bugzilla/enter_bug.cgi?reporter=&amp;product=Commons&amp;version=unspecified&amp;component=Math&amp;rep_platform=All&amp;op_sys=All&amp;priority=Other&amp;bug_severity=normal&amp;bug_status=NEW&amp;assigned_to=&amp;cc=&amp;bug_file_loc=&amp;short_desc=%5Bpatch%5D+%22Your+subject+heading+here%22&amp;comment=Please+provide+details+here.+Its+best+to+submit+patches+that+alter+existing+file%0D%0Acontent+in+%22unified+cvs+diff%22+format.+%0D%0A%0D%0ASubmissions+that+provide+new+files+can+be+supplied+as+direct+file+attachments+or%0D%0Aarchives+in+zip+or+tar.gz+format.+please+be+kind+enough+to+identify+the+format%0D%0Aof+the+attached+archive+as+bugzill+tends+to+strip+these+characterstics+by%0D%0Aremoving+the+files+extension.&amp;maketemplate=Remember+values+as+bookmarkable+template&amp;form_name=enter_bug</issueTrackingUrl>
+  <issueTrackingUrl>http://issues.apache.org/bugzilla/</issueTrackingUrl>
   <siteAddress>cvs.apache.org</siteAddress>
   <siteDirectory>/www/jakarta.apache.org/commons/${pom.artifactId.substring(8)}/</siteDirectory>
   <distributionDirectory>/www/jakarta.apache.org/builds/jakarta-commons/${pom.artifactId.substring(8)}/</distributionDirectory>
@@ -158,6 +158,9 @@
     <contributor>
       <name>Ken Geis</name>
     </contributor>
+    <contributor>
+      <name>Elliotte Rusty Harold</name>
+    </contributor>
     <contributor>
       <name>Piotr Kochanski</name>
     </contributor>
@@ -181,17 +184,19 @@
     </contributor>
   </contributors>
   <dependencies>
-    <dependency>
+     <dependency>
       <groupId>commons-logging</groupId>
       <artifactId>commons-logging</artifactId>
-      <version>1.0.3</version>
-    </dependency>
-    <dependency>
+       <version>1.0.3</version>
+       <url>http://jakarta.apache.org/commons/logging</url>
+     </dependency>
+     <dependency>
       <groupId>commons-discovery</groupId>
       <artifactId>commons-discovery</artifactId>
       <version>0.2</version>
-    </dependency>
-  </dependencies>
+      <url>http://jakarta.apache.org/commons/discovery</url>
+     </dependency>
+   </dependencies>
   <build>
     <nagEmailAddress>commons-dev@jakarta.apache.org</nagEmailAddress>
     <sourceDirectory>src/java</sourceDirectory>
@@ -227,12 +232,11 @@
     <report>maven-changes-plugin</report>
     <!--
     <report>maven-changelog-plugin</report>
-    <report>maven-checkstyle-plugin</report>
     <report>maven-clover-plugin</report>
     <report>maven-developer-activity-plugin</report>
     <report>maven-file-activity-plugin</report>
     -->
-
+    <report>maven-checkstyle-plugin</report>
     <report>maven-javadoc-plugin</report>
     <report>maven-jdepend-plugin</report>
     <report>maven-junit-report-plugin</report>