diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index b9a4422..52f8fde 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -26,7 +26,7 @@ $Id$
 INTRODUCTION:
 ============
 
-This release of Jakarta Commons Logging (JCL) is a maintenance release, with
+This release of Apache Commons Logging (JCL) is a maintenance release, with
 just a couple of fixes for using JCL under restrictive security policies.
 
 All core classes were compiled with a 1.2.x JDK. JCL may work on some 
@@ -34,11 +34,11 @@ augmented 1.1 series JREs but it is recommended that those wish to run
 on 1.1 JREs download the source and create a custom implementation by
 stripping out all the complex classloader management code.
 
-For further details, please see the Jakarta Commons Logging website:
-  http://jakarta.apache.org/commons/logging.
+For further details, please see the Apache Commons Logging website:
+  http://commons.apache.org/logging/
 
 For the very latest news, hints, FAQs etc. please see the
-Jakarta Commons Logging wiki site:
+Apache Commons Logging wiki site:
   http://wiki.apache.org/jakarta-commons/Logging
 
 Note that some containers (some versions of Apache Tomcat and JBoss in
@@ -97,13 +97,13 @@ recreate an equivalent of this jar file.
 
 == General Notes ==
 
-The jakarta commons project has migrated to the Subversion version control system
+The Apache Commons project has migrated to the Subversion version control system
 (previously, CVS was used). There should be no effect on users of the JCL
 library, but obviously the process of examining the latest source code, and of
-creating patches for JCL has now changed. Please see the jakarta commons
-website for details (http://jakarta.apache.org/commons).
+creating patches for JCL has now changed. Please see the Apache Commons
+website for details (http://commons.apache.org/).
 
-The jakarta commons project has now moved to using the Apache JIRA installation
+The Apache Commons project has now moved to using the Apache JIRA installation
 as its bugtracking system (formerly, the Apache Bugzilla installation was used).
 
 All source files for this release have been updated to reflect the new Apache
diff --git a/STATUS.html b/STATUS.html
index 4572017..56ba3b0 100644
--- a/STATUS.html
+++ b/STATUS.html
@@ -19,13 +19,13 @@
 
 <html>
 <head>
-<title>Status File for Jakarta Commons "Logging" Component</title>
+<title>Status File for Apache Commons "Logging" Component</title>
 <head>
 <body bgcolor="white">
 
 
 <div align="center">
-<h1>The Jakarta Commons <em>Logging</em> Component</h1>
+<h1>The Apache Commons <em>Logging</em> Component</h1>
 $Id$<br />
 <a href="#Introduction">[Introduction]</a>
 <a href="#Dependencies">[Dependencies]</a>
@@ -61,7 +61,7 @@ The package does :
 <li>Provide support for JDK 1.4 logging</li>
 <li>Provide support for Log4J</li>
 <li>Provide support for Avalon-Framework's Logger</li>
-<li>Provide support for <a href="http://sourceforge.net/projects/lumberjack/>
+<li>Provide support for <a href="http://sourceforge.net/projects/lumberjack/">
     LumberJack</a> logger</li>
 <li>Provide pluggable support for other logging APIs</li>
 <li>Privide a simple System.out logger</li>
@@ -86,7 +86,7 @@ components for compilation:</p>
 <ul>
 <li><a href="http://java.sun.com/j2se">Java Development Kit</a>
     (Version 1.2 or later)</li>
-<li><a href="http://jakarta.apache.org/log4j/">Jakarta Log4j</a>
+<li><a href="http://logging.apache.org/log4j/">Apache Logging Log4j</a>
     (Optional, Version 1.2.6 or later)</li>
 <li><a href="http://avalon.apache.org/">Apache Avalon
     LogKit</a> (Optional, Version 1.0.1 or later)</li>
@@ -122,12 +122,12 @@ to use are present in the classpath when they use this component. </p>
   </tr>
   <tr>
     <td><a href='http://jakarta.apache.org/builds/jakarta-commons/release/commons-logging/v1.0.1'>
-        commons-logging-1.0.1</td>
+        commons-logging-1.0.1</a></td>
     <td>12-Aug-2002</td>
   </tr>
   <tr>
     <td><a href='http://jakarta.apache.org/builds/jakarta-commons/release/commons-logging/v1.0'>
-        commons-logging-1.0</td>
+        commons-logging-1.0</a></td>
     <td>20-Feb-2002</td>
   </tr>
 </table>
diff --git a/commons-logging-api.pom b/commons-logging-api.pom
index c7f48f7..f90a3df 100644
--- a/commons-logging-api.pom
+++ b/commons-logging-api.pom
@@ -32,7 +32,7 @@
   </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>
@@ -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>
+  <siteDirectory>/www/commons.apache.org/logging/</siteDirectory>
   <distributionDirectory>/www/jakarta.apache.org/builds/jakarta-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>
 
diff --git a/project.properties b/project.properties
index 821dd53..cc279c5 100644
--- a/project.properties
+++ b/project.properties
@@ -23,7 +23,7 @@ maven.checkstyle.properties=checkstyle.xml
 # documentation properties
 maven.xdoc.date=left
 maven.xdoc.version=${pom.currentVersion}
-maven.xdoc.developmentProcessUrl=http://jakarta.apache.org/commons/charter.html
+maven.xdoc.developmentProcessUrl=http://commons.apache.org/charter.html
 maven.xdoc.poweredby.image=maven-feather.png
 
 # Jar Manifest Additional Attributes
diff --git a/src/java/org/apache/commons/logging/LogFactory.java b/src/java/org/apache/commons/logging/LogFactory.java
index 6968991..f4247c9 100644
--- a/src/java/org/apache/commons/logging/LogFactory.java
+++ b/src/java/org/apache/commons/logging/LogFactory.java
@@ -1195,7 +1195,7 @@ public abstract class LogFactory {
                             + LogFactory.class.getName() + "'. ";
                         if (implementsLogFactory) {
                             msg = msg + "The conflict is caused by the presence of multiple LogFactory classes in incompatible classloaders. " +
-                    		"Background can be found in http://jakarta.apache.org/commons/logging/tech.html. " +
+                    		"Background can be found in http://commons.apache.org/logging/tech.html. " +
                     		"If you have not explicitly specified a custom LogFactory then it is likely that " +
                     		"the container has set one without your knowledge. " +
                     		"In this case, consider using the commons-logging-adapters.jar file or " +
@@ -1203,7 +1203,7 @@ public abstract class LogFactory {
                         } else {
                         	msg = msg + "Please check the custom implementation. ";
                         }
-                        msg = msg + "Help can be found @http://jakarta.apache.org/commons/logging/troubleshooting.html.";
+                        msg = msg + "Help can be found @http://commons.apache.org/logging/troubleshooting.html.";
                         
                         if (isDiagnosticsEnabled()) {
                             logDiagnostic(msg);
diff --git a/src/java/org/apache/commons/logging/package.html b/src/java/org/apache/commons/logging/package.html
index 096f4c7..e9b32a5 100644
--- a/src/java/org/apache/commons/logging/package.html
+++ b/src/java/org/apache/commons/logging/package.html
@@ -28,7 +28,7 @@ can be used around a variety of different logging implementations, including
 prebuilt support for the following:</p>
 <ul>
 <li><a href="http://logging.apache.org/log4j/">Log4J</a> (version 1.2 or later)
-    from Apache's Jakarta project.  Each named <a href="Log.html">Log</a>
+    from Apache's Logging project.  Each named <a href="Log.html">Log</a>
     instance is connected to a corresponding Log4J Logger.</li>
 <li><a href="http://java.sun.com/j2se/1.4/docs/guide/util/logging/index.html">
     JDK Logging API</a>, included in JDK 1.4 or later systems.  Each named
diff --git a/src/java/overview.html b/src/java/overview.html
index 641f540..4fc581b 100644
--- a/src/java/overview.html
+++ b/src/java/overview.html
@@ -22,7 +22,7 @@
 <title>Overview Documentation for COMMONS-LOGGING</title>
 </head>
 <body bgcolor="white">
-<p>The <em>Logging Wrapper Library</em> component of the Jakarta Commons
+<p>The <em>Logging Wrapper Library</em> component of the Apache Commons
 subproject offers wrappers around an extensible set of concrete logging
 implementations, so that application code based on it does not need to be
 modified in order to select a different logging implementation.</p>
diff --git a/src/site/site.xml b/src/site/site.xml
index 28723ea..a4702db 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -2,8 +2,8 @@
 <project name="Commons Logging">
   <bannerRight>
     <name>Commons Logging</name>
-    <src>http://jakarta.apache.org/commons/logging/images/logo.png</src>
-    <href>http://jakarta.apache.org/commons/logging/</href>
+    <src>http://commons.apache.org/logging/images/logo.png</src>
+    <href>http://commons.apache.org/logging/</href>
   </bannerRight>
   <body>
     <menu name="Commons Logging">
@@ -28,37 +28,37 @@
     </menu>
     <menu name="1.1 Release">
       <item name="Overview"
-            href="http://jakarta.apache.org/commons/logging/commons-logging-1.1/index.html"/>
+            href="http://commons.apache.org/logging/commons-logging-1.1/index.html"/>
       <item name="User Guide"
-            href="http://jakarta.apache.org/commons/logging/commons-logging-1.1/guide.html"/>
+            href="http://commons.apache.org/logging/commons-logging-1.1/guide.html"/>
       <item name="Tech Guide"
-            href="http://jakarta.apache.org/commons/logging/commons-logging-1.1/tech.html"/>
+            href="http://commons.apache.org/logging/commons-logging-1.1/tech.html"/>
       <item name="Troubleshooting Guide"
-            href="http://jakarta.apache.org/commons/logging/commons-logging-1.1/troubleshooting.html"/>
+            href="http://commons.apache.org/logging/commons-logging-1.1/troubleshooting.html"/>
       <item name='JavaDoc'
-            href='http://jakarta.apache.org/commons/logging/commons-logging-1.1/apidocs/index.html'/>
+            href='http://commons.apache.org/logging/commons-logging-1.1/apidocs/index.html'/>
       <item name="Release Notes"
-            href="http://jakarta.apache.org/commons/logging/commons-logging-1.1/RELEASE-NOTES.txt"/>
+            href="http://commons.apache.org/logging/commons-logging-1.1/RELEASE-NOTES.txt"/>
     </menu>
     <menu name='1.0.4 Release'>
       <item   name='Documentation'
-              href='http://jakarta.apache.org/commons/logging/commons-logging-1.0.4/docs/'/>
+              href='http://commons.apache.org/logging/commons-logging-1.0.4/docs/'/>
       <item   name='JavaDoc'
-              href='http://jakarta.apache.org/commons/logging/commons-logging-1.0.4/docs/apidocs/'/>
+              href='http://commons.apache.org/logging/commons-logging-1.0.4/docs/apidocs/'/>
       <item   name='Release Notes'
-              href='http://jakarta.apache.org/commons/logging/commons-logging-1.0.4/RELEASE-NOTES.txt'/>
+              href='http://commons.apache.org/logging/commons-logging-1.0.4/RELEASE-NOTES.txt'/>
     </menu>
     <menu name='1.0.3 Release'>
       <item   name='User Guide'
-              href='http://jakarta.apache.org/commons/logging/commons-logging-1.0.3/usersguide.html'/>
+              href='http://commons.apache.org/logging/commons-logging-1.0.3/usersguide.html'/>
       <item   name='JavaDoc'
-              href='http://jakarta.apache.org/commons/logging/commons-logging-1.0.3/docs/api/'/>
+              href='http://commons.apache.org/logging/commons-logging-1.0.3/docs/api/'/>
       <item   name='Release Notes'
-              href='http://jakarta.apache.org/commons/logging/commons-logging-1.0.3/RELEASE-NOTES.txt'/>
+              href='http://commons.apache.org/logging/commons-logging-1.0.3/RELEASE-NOTES.txt'/>
     </menu>
     <menu name='1.0.2 Release'>
       <item   name='JavaDoc'
-              href='http://jakarta.apache.org/commons/logging/commons-logging-1.0.2/docs/api/'/>
+              href='http://commons.apache.org/logging/commons-logging-1.0.2/docs/api/'/>
     </menu>
   </body>
 </project>
diff --git a/xdocs/building.xml b/xdocs/building.xml
index c978751..30ec3e5 100644
--- a/xdocs/building.xml
+++ b/xdocs/building.xml
@@ -37,7 +37,7 @@ limitations under the License.
   </p>
   <p>
 	Further details can be found in the
-	<a href="http://jakarta.apache.org/commons/building.html">commons build instructions</a>.
+	<a href="http://commons.apache.org/building.html">commons build instructions</a>.
   </p>
 </section>
 <!-- ================================================== -->
diff --git a/xdocs/cvs-usage.xml b/xdocs/cvs-usage.xml
index 31022c2..210de07 100644
--- a/xdocs/cvs-usage.xml
+++ b/xdocs/cvs-usage.xml
@@ -26,20 +26,20 @@ limitations under the License.
     <!-- ================================================== -->
     <section name="Source repository">
       <p>
-        Jakarta Commons Logging is hosted on the Apache
+        Apcahe Commons Logging is hosted on the Apache
         <a href="http://subversion.tigris.org/">subversion</a> repository.
       </p>
       <p>
         The project URL is:<br />
-        <code>http://svn.apache.org/repos/asf/jakarta/commons/proper/logging/trunk</code>
+        <code>http://svn.apache.org/repos/asf/commons/proper/logging/trunk</code>
       </p>
       <p>
         The best way to view the repository is via the
-        <a href="http://svn.apache.org/viewcvs.cgi/jakarta/commons/proper/logging/trunk/">subversion viewer</a>.
+        <a href="http://svn.apache.org/viewvc/commons/proper/logging/trunk/">subversion viewer</a>.
       </p>
       <p>
         The alternative is to use the
-        <a href="http://svn.apache.org/repos/asf/jakarta/commons/proper/logging/trunk/">native subversion</a> display.
+        <a href="http://svn.apache.org/repos/asf/commons/proper/logging/trunk/">native subversion</a> display.
       </p>
     </section>
     <!-- ================================================== -->
diff --git a/xdocs/guide.xml b/xdocs/guide.xml
index 2b4c4ad..ea0b7e4 100644
--- a/xdocs/guide.xml
+++ b/xdocs/guide.xml
@@ -22,7 +22,7 @@
 <document>
 
  <properties>
-  <title>Users Guide : Jakarta Commons Logging</title>
+  <title>Users Guide : Apache Commons Logging</title>
   <author email="dev@commons.apache.org">Commons Documentation Team</author>
  </properties>
 
@@ -89,7 +89,7 @@
     </section>
     <section name="Introduction">
         <p>
-The Jakarta Commons Logging (JCL) provides a <code>Log</code> interface that
+The Apache Commons Logging (JCL) provides a <code>Log</code> interface that
 is intended to be both light-weight and an independent abstraction of other logging toolkits.
 It provides the middleware/tooling developer with a simple
 logging abstraction, that allows the user (application developer) to plug in
@@ -166,16 +166,16 @@ compatibility to pre-1.0 versions of this API, a system property
                 <li>
 If the Log4J logging system is available in the application
 class path, use the corresponding wrapper class
-(<a href="http://jakarta.apache.org/commons/logging/apidocs/org/apache/commons/logging/impl/Log4JLogger.html">Log4JLogger</a>).
+(<a href="http://commons.apache.org/logging/apidocs/org/apache/commons/logging/impl/Log4JLogger.html">Log4JLogger</a>).
             </li>
                 <li>
 If the application is executing on a JDK 1.4 system, use
 the corresponding wrapper class
-(<a href="http://jakarta.apache.org/commons/logging/apidocs/org/apache/commons/logging/impl/Jdk14Logger.html">Jdk14Logger</a>).
+(<a href="http://commons.apache.org/logging/apidocs/org/apache/commons/logging/impl/Jdk14Logger.html">Jdk14Logger</a>).
             </li>
                 <li>
 Fall back to the default simple logging wrapper
-(<a href="http://jakarta.apache.org/commons/logging/apidocs/org/apache/commons/logging/impl/SimpleLog.html">SimpleLog</a>).
+(<a href="http://commons.apache.org/logging/apidocs/org/apache/commons/logging/impl/SimpleLog.html">SimpleLog</a>).
             </li>
         </ol>
             <p>
@@ -239,7 +239,7 @@ and
 Likewise, setting
 <code>log4j.logger.org.apache.component=DEBUG</code>
 will enable debug message for all 'component' classes,
-but not for other Jakarta projects.
+but not for other Apache projects.
                 </li>
                     <li>
 <strong>log4j.appender.<i>appender</i>.Threshold=<i>priority</i></strong>
diff --git a/xdocs/index.xml b/xdocs/index.xml
index 71c5dd4..35d0cbb 100644
--- a/xdocs/index.xml
+++ b/xdocs/index.xml
@@ -60,7 +60,7 @@ containing any code that is specific to the logging implementation used.</p>
 Release Notes</a> document the new features and bug fixes that have been
 included in the latest release.</p>
 
-<p>The <a href="http://jakarta.apache.org/commons/logging/apidocs/index.html">
+<p>The <a href="http://commons.apache.org/logging/apidocs/index.html">
 JavaDoc API documents</a> for the latest release are available online.
 In particular, you should read the package overview of the <code>org.apache.commons.logging</code>
 package. In addition, there is a (short)
diff --git a/xdocs/issue-tracking.xml b/xdocs/issue-tracking.xml
index a35496c..14d7dcf 100644
--- a/xdocs/issue-tracking.xml
+++ b/xdocs/issue-tracking.xml
@@ -40,7 +40,7 @@ limitations under the License.
         <ol>
         <li><a href="http://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&amp;pid=12310484&amp;sorter/field=issuekey&amp;sorter/order=DESC&amp;status=1&amp;status=4">Search existing open bugs</a>.
         If you find your issue listed then please add a comment with your details.</li>
-        <li><a href="http://mail-archives.apache.org/mod_mbox/jakarta-commons-dev/">Search the mailing list archive</a>.
+        <li><a href="http://mail-archives.apache.org/mod_mbox/commons-dev/">Search the mailing list archive</a>.
         You may find your issue or idea has already been discussed.</li>
         <li><a href="http://issues.apache.org/jira/browse/LOGGING">Submit a bug report or enhancement request</a>.</li>
         </ol>
diff --git a/xdocs/junit-report.xml b/xdocs/junit-report.xml
index af79214..e867fa0 100644
--- a/xdocs/junit-report.xml
+++ b/xdocs/junit-report.xml
@@ -26,7 +26,7 @@ limitations under the License.
     <!-- ================================================== -->
     <section name="Summary">
       <p>
-        The Jakarta Commons Logging test cases make extensive use of
+        The Apache Commons Logging test cases make extensive use of
         sophisticated classloader configurations in order to simulate the
         behaviour of various containers. It is difficult to run these tests
         under Maven (which is used to generate the website). Once JCL is
diff --git a/xdocs/navigation.xml b/xdocs/navigation.xml
index b9a7c3f..df7651a 100755
--- a/xdocs/navigation.xml
+++ b/xdocs/navigation.xml
@@ -18,18 +18,18 @@
  limitations under the License.
 
 -->
-<!DOCTYPE org.apache.commons.menus SYSTEM 'http://jakarta.apache.org/commons/build/maven-build.dtd'>
+<!DOCTYPE org.apache.commons.menus SYSTEM 'http://commons.apache.org/build/maven-build.dtd'>
 <project name="Logging">
 
   <title>Logging</title>
-  <organizationLogo href="/images/jakarta-logo.gif">
-   Jakarta
+  <organizationLogo href="/images/logo.png">
+   Apache Commons
   </organizationLogo>
 
   <body>
     <links>
-      <item name="Jakarta Commons"
-            href="http://jakarta.apache.org/commons/"/>
+      <item name="Apache Commons"
+            href="http://commons.apache.org/"/>
     </links>
 
     <menu name="Commons Logging">
@@ -54,37 +54,37 @@
     </menu>
     <menu name="1.1 Release">
       <item name="Overview"
-            href="http://jakarta.apache.org/commons/logging/commons-logging-1.1/index.html"/>
+            href="http://commons.apache.org/logging/commons-logging-1.1/index.html"/>
       <item name="User Guide"
-            href="http://jakarta.apache.org/commons/logging/commons-logging-1.1/guide.html"/>
+            href="http://commons.apache.org/logging/commons-logging-1.1/guide.html"/>
       <item name="Tech Guide"
-            href="http://jakarta.apache.org/commons/logging/commons-logging-1.1/tech.html"/>
+            href="http://commons.apache.org/logging/commons-logging-1.1/tech.html"/>
       <item name="Troubleshooting Guide"
-            href="http://jakarta.apache.org/commons/logging/commons-logging-1.1/troubleshooting.html"/>
+            href="http://commons.apache.org/logging/commons-logging-1.1/troubleshooting.html"/>
       <item name='JavaDoc'
-            href='http://jakarta.apache.org/commons/logging/commons-logging-1.1/apidocs/index.html'/>
+            href='http://commons.apache.org/logging/commons-logging-1.1/apidocs/index.html'/>
       <item name="Release Notes"
-            href="http://jakarta.apache.org/commons/logging/commons-logging-1.1/RELEASE-NOTES.txt"/>
+            href="http://commons.apache.org/logging/commons-logging-1.1/RELEASE-NOTES.txt"/>
     </menu>
     <menu name='1.0.4 Release'>
       <item   name='Documentation'
-              href='http://jakarta.apache.org/commons/logging/commons-logging-1.0.4/docs/'/>
+              href='http://commons.apache.org/logging/commons-logging-1.0.4/docs/'/>
       <item   name='JavaDoc'
-              href='http://jakarta.apache.org/commons/logging/commons-logging-1.0.4/docs/apidocs/'/>
+              href='http://commons.apache.org/logging/commons-logging-1.0.4/docs/apidocs/'/>
       <item   name='Release Notes'
-              href='http://jakarta.apache.org/commons/logging/commons-logging-1.0.4/RELEASE-NOTES.txt'/>
+              href='http://commons.apache.org/logging/commons-logging-1.0.4/RELEASE-NOTES.txt'/>
     </menu>
     <menu name='1.0.3 Release'>
       <item   name='User Guide'
-              href='http://jakarta.apache.org/commons/logging/commons-logging-1.0.3/usersguide.html'/>
+              href='http://commons.apache.org/logging/commons-logging-1.0.3/usersguide.html'/>
       <item   name='JavaDoc'
-              href='http://jakarta.apache.org/commons/logging/commons-logging-1.0.3/docs/api/'/>
+              href='http://commons.apache.org/logging/commons-logging-1.0.3/docs/api/'/>
       <item   name='Release Notes'
-              href='http://jakarta.apache.org/commons/logging/commons-logging-1.0.3/RELEASE-NOTES.txt'/>
+              href='http://commons.apache.org/logging/commons-logging-1.0.3/RELEASE-NOTES.txt'/>
     </menu>
     <menu name='1.0.2 Release'>
       <item   name='JavaDoc'
-              href='http://jakarta.apache.org/commons/logging/commons-logging-1.0.2/docs/api/'/>
+              href='http://commons.apache.org/logging/commons-logging-1.0.2/docs/api/'/>
     </menu>
 
     &commons;
diff --git a/xdocs/style/project.css b/xdocs/style/project.css
index 0130204..c1d541c 100644
--- a/xdocs/style/project.css
+++ b/xdocs/style/project.css
@@ -1 +1 @@
-@import url("http://jakarta.apache.org/style/jakarta-maven.css");
+@import url("http://commons.apache.org/style/commons-maven.css");
diff --git a/xdocs/tech.xml b/xdocs/tech.xml
index 9da1d78..4e112d1 100644
--- a/xdocs/tech.xml
+++ b/xdocs/tech.xml
@@ -183,10 +183,10 @@ limitations under the License.
 			</p>
 			<ul>
 				<li>
-	posting to the <a href='http://jakarta.apache.org/site/mail.html'>jakarta commons-dev mailing list</a> or
+	posting to the <a href='http://commons.apache.org/mail-lists.html'>Apache Commons dev mailing list</a> or
 				</li>
 				<li>
-	creating an issue in <a href='http://issues.apache.org/bugzilla/'>Bugzilla</a>.	
+	creating an issue in <a href='http://issues.apache.org/jira/browse/LOGGING/'>JIRA</a>.	
 				</li>
 			</ul>
 			<p>
diff --git a/xdocs/troubleshooting.xml b/xdocs/troubleshooting.xml
index 6332240..266670e 100644
--- a/xdocs/troubleshooting.xml
+++ b/xdocs/troubleshooting.xml
@@ -301,7 +301,7 @@ classloader used to load <code>LogFactory</code> and to the TCCL.
   		 <li>WebSphere Application Server (other versions).</li>
   		</ul>
   	<p>
-The Jakarta Commons team would be grateful if reports were posted to the development list
+The Apache Commons team would be grateful if reports were posted to the development list
 of other containers using a custom implementation.
   	</p>
   	<subsection name='The Incompatible LogFactory Issue'>
@@ -315,10 +315,10 @@ of other containers using a custom implementation.
   implementation should be used but Class 'com.ibm.ws.commons.logging.TrLogFactory' cannot be converted 
   to 'org.apache.commons.logging.LogFactory'. The conflict is caused by the presence of multiple 
   LogFactory classes in incompatible classloaders. Background can be found in 
-  http://jakarta.apache.org/commons/logging/tech.html. If you have not explicitly specified a custom 
+  http://commons.apache.org/logging/tech.html. If you have not explicitly specified a custom
   LogFactory then it is likely that the container has set one without your knowledge. 
   In this case, consider using the commons-logging-adapters.jar file or specifying the standard 
-  LogFactory from the command line. Help can be found @http://jakarta.apache.org/commons/logging.
+  LogFactory from the command line. Help can be found @http://commons.apache.org/logging.
   </pre></code>
   			<p>
   This is a WebSphere example so the name of the custom LogFactory is 
