diff --git a/commons-logging-README.txt b/commons-logging-README.txt
deleted file mode 100644
index 1fad379..0000000
--- a/commons-logging-README.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-The Logging package is an ultra-thin bridge between different logging implementations. A library that uses the commons-logging API can be used with any logging implementation at runtime. Commons-logging comes with support for a number of popular logging implementations, and writing adapters for others is a reasonably simple task.
-
-See RELEASE-NOTES.txt for details on the current release.
-
-
-Note: The maven2 pom.xml file is affected by the presence or absence of this file. See the comments in that file for details.
diff --git a/doap_logging.rdf b/doap_logging.rdf
index de3f8c3..2f3205a 100644
--- a/doap_logging.rdf
+++ b/doap_logging.rdf
@@ -1,14 +1,14 @@
 <?xml version="1.0"?>
 <rdf:RDF xmlns="http://usefulinc.com/ns/doap#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:asfext="http://projects.apache.org/ns/asfext#" xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#" xmlns:doap="http://usefulinc.com/ns/doap#" xml:lang="en">
-  <Project rdf:about="http://jakarta.apache.org/commons/logging/">
-    <name>Apache Jakarta Commons Logging</name>
-    <homepage rdf:resource="http://jakarta.apache.org/commons/logging/"/>
+  <Project rdf:about="http://commons.apache.org/logging/">
+    <name>Apache Apache Commons Logging</name>
+    <homepage rdf:resource="http://commons.apache.org/logging/"/>
     <programming-language>Java</programming-language>
     <category rdf:resource="http://projects.apache.org/category/library"/>
     <license rdf:resource="http://usefulinc.com/doap/licenses/asl20"/>
     <bug-database rdf:resource="http://issues.apache.org/jira/browse/LOGGING"/>
     <download-page rdf:resource="http://jakarta.apache.org/site/downloads/downloads_commons-logging.cgi"/>
-    <asfext:pmc rdf:resource="http://jakarta.apache.org/"/>
+    <asfext:pmc rdf:resource="http://commons.apache.org/"/>
     <shortdesc xml:lang="en">Commons Logging</shortdesc>
     <description xml:lang="en">
     Commons Logging is a thin adapter allowing configurable bridging to other,
@@ -27,6 +27,6 @@
         <version>1.0.4</version>
       </revision>
     </release>
-    <mailing-list rdf:resource="http://jakarta.apache.org/site/mail2.html#Commons"/>
+    <mailing-list rdf:resource="http://commons.apache.org/mail-lists.html"/>
   </Project>
 </rdf:RDF>
diff --git a/pom.xml b/pom.xml
index ad2c53c..999ffac 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,7 +34,7 @@
   <version>1.1.1-SNAPSHOT</version>
   <description>Commons Logging is a thin adapter allowing configurable bridging to other,
     well known logging systems.</description>
-  <url>http://jakarta.apache.org/commons/logging</url>
+  <url>http://commons.apache.org/logging</url>
 
   <issueManagement>
     <url>http://issues.apache.org/jira/browse/LOGGING</url>
@@ -122,9 +122,9 @@
   </developers>
 
   <scm>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/jakarta/commons/proper/logging/trunk</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/jakarta/commons/proper/logging/trunk</developerConnection>
-    <url>http://svn.apache.org/repos/asf/jakarta/commons/proper/logging/trunk</url>
+    <connection>scm:svn:http://svn.apache.org/repos/asf/commons/proper/logging/trunk</connection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/commons/proper/logging/trunk</developerConnection>
+    <url>http://svn.apache.org/repos/asf/commons/proper/logging/trunk</url>
   </scm>
 
   <build>
@@ -263,6 +263,39 @@
         </executions>
       </plugin> 
 
+      <plugin>
+        <!--
+          - Attach the adapters and api jars to the normal artifact. This way
+          - they will be deployed when the normal artifact is deployed.
+          -->
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>build-helper-maven-plugin</artifactId>
+        <version>1.0</version>
+        <executions>
+          <execution>
+            <id>attach-artifacts</id>
+            <phase>package</phase>
+            <goals>
+              <goal>attach-artifact</goal>
+            </goals>
+            <configuration>
+              <artifacts>
+                <artifact>
+                  <file>${project.build.directory}/${project.artifactId}-adapters-${project.version}.jar</file>
+                  <type>jar</type>
+                  <classifier>adapters</classifier>
+                </artifact>
+                <artifact>
+                  <file>${project.build.directory}/${project.artifactId}-api-${project.version}.jar</file>
+                  <type>jar</type>
+                  <classifier>api</classifier>
+                </artifact>
+              </artifacts>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+
       <plugin>
         <!--
           - Many of JCL's tests use tricky techniques to place the generated
@@ -387,7 +420,7 @@
   <distributionManagement>
     <site>
       <id>apache.website</id>
-      <url>${commons.deployment.protocol}://people.apache.org//www/jakarta.apache.org/commons/logging/</url>
+      <url>${commons.deployment.protocol}://people.apache.org//www/commons.apache.org/logging/</url>
     </site>
   </distributionManagement>
   <properties>
diff --git a/project.xml b/project.xml
index f98ac4c..7c3ced0 100644
--- a/project.xml
+++ b/project.xml
@@ -32,13 +32,13 @@
   </description>
   <logo>/images/logo.png</logo>
   
-  <url>http://jakarta.apache.org/commons/logging/</url>
+  <url>http://commons.apache.org/logging/</url>
   <package>org.apache.commons.logging</package>
 
   <organization>
     <name>The Apache Software Foundation</name>
-    <url>http://jakarta.apache.org</url>
-    <logo>http://jakarta.apache.org/images/original-jakarta-logo.gif</logo>
+    <url>http://commons.apache.org/</url>
+    <logo>http://commons.apache.org/images/logo.png</logo>
   </organization>
 
   <licenses>
@@ -49,15 +49,15 @@
     </license>
   </licenses>
   
-  <gumpRepositoryId>jakarta</gumpRepositoryId>
+  <gumpRepositoryId>commons</gumpRepositoryId>
   <issueTrackingUrl>http://issues.apache.org/jira/browse/LOGGING</issueTrackingUrl>
   <siteAddress>people.apache.org</siteAddress>
-  <siteDirectory>/www/jakarta.apache.org/commons/logging/</siteDirectory>
-  <distributionDirectory>/www/jakarta.apache.org/builds/jakarta-commons/logging/</distributionDirectory>
+  <siteDirectory>/www/commons.apache.org/logging/</siteDirectory>
+  <distributionDirectory>/www/people.apache.org/builds/commons/logging/</distributionDirectory>
   
   <repository>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/jakarta/commons/proper/logging/trunk/</connection>
-    <url>http://svn.apache.org/repos/asf/jakarta/commons/proper/logging/trunk/</url>
+    <connection>scm:svn:http://svn.apache.org/repos/asf/commons/proper/logging/trunk/</connection>
+    <url>http://svn.apache.org/repos/asf/commons/proper/logging/trunk/</url>
   </repository>
   
   <versions>
@@ -91,15 +91,15 @@
   <mailingLists>
     <mailingList>
       <name>Commons Dev List</name>
-      <subscribe>commons-dev-subscribe@jakarta.apache.org</subscribe>
-      <unsubscribe>commons-dev-unsubscribe@jakarta.apache.org</unsubscribe>
-      <archive>http://mail-archives.apache.org/mod_mbox/jakarta-commons-dev/</archive>
+      <subscribe>dev-subscribe@commons.apache.org</subscribe>
+      <unsubscribe>dev-unsubscribe@commons.apache.org</unsubscribe>
+      <archive>http://mail-archives.apache.org/mod_mbox/commons-dev/</archive>
     </mailingList>
     <mailingList>
       <name>Commons User List</name>
-      <subscribe>commons-user-subscribe@jakarta.apache.org</subscribe>
-      <unsubscribe>commons-user-unsubscribe@jakarta.apache.org</unsubscribe>
-      <archive>http://mail-archives.apache.org/mod_mbox/jakarta-commons-user/</archive>
+      <subscribe>user-subscribe@commons.apache.org</subscribe>
+      <unsubscribe>user-unsubscribe@commons.apache.org</unsubscribe>
+      <archive>http://mail-archives.apache.org/mod_mbox/commons-user/</archive>
     </mailingList>
   </mailingLists>
 
@@ -256,7 +256,7 @@ Runtime Optional.
     </dependency>
   </dependencies>
   <build>
-    <nagEmailAddress>commons-dev@jakarta.apache.org</nagEmailAddress>
+    <nagEmailAddress>dev@commons.apache.org</nagEmailAddress>
     <sourceDirectory>src/java</sourceDirectory>
     <unitTestSourceDirectory>src/test</unitTestSourceDirectory>
     <sourceModifications>