diff --git a/build.properties.sample b/build.properties.sample
index 73ddd69..fb705e7 100644
--- a/build.properties.sample
+++ b/build.properties.sample
@@ -13,3 +13,7 @@ avalon-framework.jar=../../Avalon-4.1.4/avalon-framework-4.1.4.jar
 #
 # junit.jar=../../jakarta-velocity/build/lib/junit-3.7.jar
 
+# Maven properties (for web site build)
+# Those committers using agents may like to use
+#maven.username=rdonkin
+#logging.cvs=lserver:rdonkin@cvs.apache.org:/home/cvs
\ No newline at end of file
diff --git a/checkstyle.xml b/checkstyle.xml
new file mode 100644
index 0000000..d02e0af
--- /dev/null
+++ b/checkstyle.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+
+<!DOCTYPE module PUBLIC
+    "-//Puppy Crawl//DTD Check Configuration 1.1//EN"
+    "http://www.puppycrawl.com/dtds/configuration_1_1.dtd">
+
+<!-- commons codec customization of default Checkstyle behavior -->
+<module name="Checker">
+  <property name="basedir" value="src/checkstyle"/>
+  <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.txt"/>
+      <property name="ignoreLines" value="2,3,4,10"/>
+    </module>
+
+    <module name="OperatorWrap">
+      <property name="option" value="eol"/>
+    </module>
+  </module>
+</module>
+
diff --git a/project.properties b/project.properties
new file mode 100644
index 0000000..815505a
--- /dev/null
+++ b/project.properties
@@ -0,0 +1,9 @@
+# documentation properties
+maven.xdoc.date=left
+maven.xdoc.version=${pom.currentVersion}
+maven.xdoc.developmentProcessUrl=http://jakarta.apache.org/commons/charter.html
+maven.xdoc.poweredby.image=maven-feather.png
+
+maven.junit.fork=true
+
+logging.cvs=pserver:anoncvs@cvs.apache.org:/home/cvspublic
\ No newline at end of file
diff --git a/project.xml b/project.xml
index 0aee5d8..664f676 100644
--- a/project.xml
+++ b/project.xml
@@ -4,17 +4,90 @@
   <extend>../commons-build/project.xml</extend>
   <name>Logging</name>
   <id>commons-logging</id>
+  <logo></logo>
   <currentVersion>1.0-dev</currentVersion>
 
+  <organization>
+    <name>Apache Software Foundation</name>
+    <url>http://www.apache.org</url>
+    <logo>http://jakarta.apache.org/images/jakarta-logo.gif</logo>
+  </organization>
+
   <inceptionYear>2001</inceptionYear>
   <shortDescription>Commons Logging</shortDescription>
   <description>
-    Commons Logging
+Commons Logging is a thin adapter allowing configurable bridging to other, 
+well known logging systems.
   </description>
+  
+  <logo>/images/logo.png</logo>
+  
+  <repository>
+    <connection>scm:cvs:${logging.cvs}:jakarta-commons/logging/</connection>
+    <url>http://cvs.apache.org/viewcvs/jakarta-commons/logging/</url>
+  </repository>
 
   <url>http://jakarta.apache.org/commons/logging/</url>
   
   <developers>
+    <developer>
+      <name>Morgan Delagrange</name>
+      <id>morgand</id>
+      <email>morgand at apache dot org</email>
+      <organization>Apache</organization>
+      <roles><role>Java Developer</role></roles>
+    </developer>
+    <developer>
+      <name>Rodney Waldhoff</name>
+      <id>rwaldhoff</id>
+      <email>rwaldhoff at apache org</email>
+      <organization>Apache Software Foundation</organization>
+    </developer>
+    <developer>
+      <name>Craig McClanahan</name>
+      <id>craigmcc</id>
+      <email>craigmcc at apache org</email>
+      <organization>Apache Software Foundation</organization>
+    </developer>
+    <developer>
+      <name>Scott Sanders</name>
+      <id>sanders</id> 
+      <email>sanders at apache dot org</email>
+      <organization>Apache Software Foundation</organization>
+    </developer>
+    <developer>
+      <name>Robert Burrell Donkin</name>
+      <id>rdonkin</id>
+      <email>rdonkin at apache dot org</email>
+      <organization>Apache Software Foundation</organization>
+    </developer>
+    <developer>
+      <name>Peter Donald</name>
+      <id>donaldp</id>
+      <email>donaldp at apache dot org</email>
+      <organization></organization>
+    </developer>
+    <developer>
+      <name>Costin Manolache</name>
+      <id>costin</id>
+      <email>costin at apache dot org</email>
+      <organization>Apache Software Foundation</organization>
+    </developer>
+    <developer>
+      <name>Richard Sitze</name>
+      <id>rsitze</id>
+      <email>rsitze at apache dot org</email>
+      <organization>Apache Software Foundation</organization>
+    </developer>
+    <developer>
+      <name>Juozas Baliuka</name>
+      <id>baliuka</id>
+      <email>baliuka@apache.org</email>
+      <organization></organization>
+      <roles>
+        <role>Java Developer</role>
+      </roles>
+    </developer>
   </developers>
   
   <dependencies>
@@ -36,11 +109,10 @@
     
     <dependency>
       <id>avalon-framework</id>
-      <version>4.0</version>
+      <version>4.1.3</version>
     </dependency>
     
   </dependencies>
-
   <build>
     <sourceModifications>
       <sourceModification>
@@ -50,6 +122,21 @@
         </excludes>
       </sourceModification>
     </sourceModifications>
+    <unitTest>
+        <!--
+At the moment there are problems running the unit tests under maven.
+the unit tests run by custom ant target which perform configuration
+before the tests are run.
+There is no easy way to run these under maven at the moment.
+        -->
+        <directory>${pom.build.unitTestSourceDirectory}</directory>
+        <includes>
+            <include>**/AvalonLoggerTest.java</include>
+        </includes>
+        <resources>
+            <resource>**/*.properties</resource>
+        </resources>
+    </unitTest>
   </build>
 
 </project>