diff --git a/pom.xml b/pom.xml
index 61bc6f6b..0ac1c33e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,26 +26,15 @@
         <developer>
             <id>poutsma</id>
             <name>Arjen Poutsma</name>
-            <email>apoutsma@interface21.com</email>
-            <organization>Interface21</organization>
-            <organizationUrl>http://www.interface21.com</organizationUrl>
+            <email>arjen.poutsma@springsource.com</email>
+            <organization>SpringSource</organization>
+            <organizationUrl>http://www.springsource.com</organizationUrl>
             <roles>
                 <role>Project Admin</role>
                 <role>Developer</role>
             </roles>
             <timezone>+1</timezone>
         </developer>
-        <developer>
-            <id>springboy</id>
-            <name>Rick Evans</name>
-            <email>revans@interface21.com</email>
-            <organization>Interface21</organization>
-            <organizationUrl>http://www.interface21.com</organizationUrl>
-            <roles>
-                <role>Developer</role>
-                <role>Documentalist</role>
-            </roles>
-        </developer>
     </developers>
     <contributors>
         <contributor>
@@ -57,6 +46,9 @@
         <contributor>
             <name>Kristoffer Moum</name>
         </contributor>
+        <contributor>
+            <name>Rick Evans</name>
+        <contributor>
     </contributors>
     <organization>
         <name>The Spring Web Services Framework</name>
diff --git a/src/docbkx/resources/xsl/html_chunk.xsl b/src/docbkx/resources/xsl/html_chunk.xsl
index 20a4f719..71ea91a7 100644
--- a/src/docbkx/resources/xsl/html_chunk.xsl
+++ b/src/docbkx/resources/xsl/html_chunk.xsl
@@ -77,7 +77,7 @@
                title="The Spring Framework - Spring Web Services">
                 <img style="border:none;" src="images/xdev-spring_logo.jpg"/>
             </a>
-            <a style="border:none;" href="http://www.interface21.com/" title="Interface21 - Spring from the Source">
+            <a style="border:none;" href="http://www.springsource.com/" title="SpringSource">
                 <img style="border:none;position:absolute;padding-top:5px;right:42px;" src="images/i21-banner-rhs.jpg"/>
             </a>
         </div>
diff --git a/src/main/javadoc/overview.html b/src/main/javadoc/overview.html
index a2d4e724..eeb70e59 100644
--- a/src/main/javadoc/overview.html
+++ b/src/main/javadoc/overview.html
@@ -15,9 +15,9 @@ This document is the API specification for the Spring Web Services Framework
     <p>
         If you are interested in commercial training, consultancy, and
         support for the Spring Web Services Framework,
-        <a href="http://www.interface21.com/" target="_top">Interface 21</a> provides
+        <a href="http://www.springsource.com/" target="_top">SpringSource</a> provides
         such commercial support.
     </p>
 </div>
 </body>
-</html>
\ No newline at end of file
+</html>