diff --git a/org.springframework.oxm/src/main/java/org/springframework/oxm/castor/package-info.java b/org.springframework.oxm/src/main/java/org/springframework/oxm/castor/package-info.java
index 42f8cdade2..1f1167ab09 100644
--- a/org.springframework.oxm/src/main/java/org/springframework/oxm/castor/package-info.java
+++ b/org.springframework.oxm/src/main/java/org/springframework/oxm/castor/package-info.java
@@ -1,7 +1,7 @@
 
 /**
  *
- * Package providing integration of <a href="http://www.castor.org/xml-mapping.html">Castor</a> within Springs O/X Mapping
+ * Package providing integration of <a href="http://castor.codehaus.org/xml-mapping.html">Castor</a> within Springs O/X Mapping
  * support
  *
  */
diff --git a/org.springframework.oxm/src/test/resources/org/springframework/oxm/castor/mapping.xml b/org.springframework.oxm/src/test/resources/org/springframework/oxm/castor/mapping.xml
index e85971251c..f54e293fdf 100644
--- a/org.springframework.oxm/src/test/resources/org/springframework/oxm/castor/mapping.xml
+++ b/org.springframework.oxm/src/test/resources/org/springframework/oxm/castor/mapping.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE mapping PUBLIC "-//EXOLAB/Castor Mapping DTD Version 1.0//EN" "http://castor.org/mapping.dtd">
+<!DOCTYPE mapping PUBLIC "-//EXOLAB/Castor Mapping DTD Version 1.0//EN" "http://castor.codehaus.org/mapping.dtd">
 <mapping>
     <description>Castor generated mapping file</description>
     <class name="org.springframework.oxm.castor.Flights">
@@ -28,4 +28,4 @@
                       xmlns:tns="http://samples.springframework.org/flight"/>
         </field>
     </class>
-</mapping>
\ No newline at end of file
+</mapping>
diff --git a/spring-framework-reference/src/oxm.xml b/spring-framework-reference/src/oxm.xml
index 65ef24cccf..225c45216f 100644
--- a/spring-framework-reference/src/oxm.xml
+++ b/spring-framework-reference/src/oxm.xml
@@ -437,7 +437,7 @@ public class Application {
             though a mapping file can be used to have more control over the behavior of Castor.
         </para>
         <para>
-            For more information on Castor, refer to the <ulink url="http://castor.org/xml-framework.html">
+            For more information on Castor, refer to the <ulink url="http://castor.codehaus.org/xml-framework.html">
             <citetitle>Castor web site</citetitle></ulink>. The Spring integration classes reside in the
             <package>org.springframework.oxm.castor</package> package.
         </para>
@@ -461,7 +461,7 @@ public class Application {
             <para>
                 Although it is possible to rely on Castor's default marshalling behavior, it might be necessary to have
                 more control over it. This can be accomplished using a Castor mapping file. For more information, refer
-                to <ulink url="http://castor.org/xml-mapping.html">Castor XML Mapping</ulink>.
+                to <ulink url="http://castor.codehaus.org/xml-mapping.html">Castor XML Mapping</ulink>.
             </para>
             <para>
                 The mapping can be set using the <property>mappingLocation</property> resource property, indicated