diff --git a/notice.txt b/notice.txt
index 2cd3e112..ac67369f 100644
--- a/notice.txt
+++ b/notice.txt
@@ -18,4 +18,4 @@
    The names "Spring" and "Spring Framework" must not be used to
    endorse or promote products derived from this software without
    prior written permission. For written permission, please contact
-   rod.johnson@interface21.com or juergen.hoeller@interface21.com.
+   rod.johnson@springsource.com or juergen.hoeller@springsource.com.
diff --git a/pom.xml b/pom.xml
index 5a2e49db..8f6577f2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -75,14 +75,12 @@
         </snapshotRepository>
         <site>
             <id>static.springframework.org</id>
-            <url>scp://static.springframework.org/var/www/domains/springframework.org/static/htdocs/spring-ws/site</url>
+            <url>scp://static.springframework.org/var/www/domains/springframework.org/static/htdocs/spring-ws/sites/1.5</url>
         </site>
     </distributionManagement>
     <scm>
-        <connection>scm:svn:https://springframework.svn.sourceforge.net/svnroot/springframework/spring-ws/trunk
-        </connection>
-        <developerConnection>scm:svn:https://springframework.svn.sourceforge.net/svnroot/springframework/spring-ws/trunk
-        </developerConnection>
+        <connection>scm:svn:https://springframework.svn.sourceforge.net/svnroot/springframework/spring-ws/trunk</connection>
+        <developerConnection>scm:svn:https://springframework.svn.sourceforge.net/svnroot/springframework/spring-ws/trunk</developerConnection>
         <url>http://fisheye3.cenqua.com/browse/springframework/spring-ws/trunk</url>
     </scm>
     <modules>
diff --git a/src/docbkx/resources/images/s2_box_logo.png b/src/docbkx/resources/images/s2_box_logo.png
new file mode 100644
index 00000000..8c778a57
Binary files /dev/null and b/src/docbkx/resources/images/s2_box_logo.png differ
diff --git a/src/docbkx/resources/xsl/html_chunk.xsl b/src/docbkx/resources/xsl/html_chunk.xsl
index 71ea91a7..59016d81 100644
--- a/src/docbkx/resources/xsl/html_chunk.xsl
+++ b/src/docbkx/resources/xsl/html_chunk.xsl
@@ -70,7 +70,7 @@
     <!--###################################################
                      Headers and Footers
     ################################################### -->
-    <!-- let's have a Spring and I21 banner across the top of each page -->
+    <!-- let's have a Spring and SpringSource banner across the top of each page -->
     <xsl:template name="user.header.navigation">
         <div style="background-color:white;border:none;height:73px;border:1px solid black;">
             <a style="border:none;" href="http://static.springframework.org/spring-ws/site/"
@@ -78,14 +78,14 @@
                 <img style="border:none;" src="images/xdev-spring_logo.jpg"/>
             </a>
             <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"/>
+                <img style="border:none;position:absolute;padding-top:5px;right:42px;" src="images/s2_box_logo.png"/>
             </a>
         </div>
     </xsl:template>
     <!-- no other header navigation (prev, next, etc.) -->
     <xsl:template name="header.navigation"/>
     <xsl:param name="navig.showtitles">1</xsl:param>
-    <!-- let's have a 'Sponsored by Interface21' strapline (or somesuch) across the bottom of each page -->
+    <!-- let's have a 'Sponsored by SpringSource' strapline (or somesuch) across the bottom of each page -->
     <xsl:template name="footer.navigation">
         <xsl:param name="prev" select="/foo"/>
         <xsl:param name="next" select="/foo"/>
@@ -187,8 +187,8 @@
                                 </td>
                                 <td width="20%" align="center">
                                     <span style="color:white;font-size:90%;">
-                                        <a href="http://www.interface21.com/"
-                                           title="Interface21 - Spring from the Source">Sponsored by Interface21
+                                        <a href="http://www.springsource.com/"
+                                           title="SpringSource">Sponsored by SpringSource
                                         </a>
                                     </span>
                                 </td>
diff --git a/src/site/apt/downloads/releases.apt b/src/site/apt/downloads/releases.apt
index 13a29d91..c7d7f412 100644
--- a/src/site/apt/downloads/releases.apt
+++ b/src/site/apt/downloads/releases.apt
@@ -13,4 +13,4 @@ Downloads
 	
 	* <<Spring-WS 1.5-M1 is the upcoming development release>>
 
-		* {{{snapshots.html}Download nighly snapshots}}
+		* {{{snapshots.html}Download nightly snapshots}}
diff --git a/src/site/site.xml b/src/site/site.xml
index b21be9e5..6cf6d159 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -3,7 +3,7 @@
     <skin>
         <groupId>org.springframework.maven.skins</groupId>
         <artifactId>maven-spring-skin</artifactId>
-        <version>1.0.3</version>
+        <version>1.0.4</version>
     </skin>
     <publishDate position="left" format="d MMM yyyy"/>
     <bannerLeft>
@@ -20,7 +20,7 @@
             <script type="text/javascript" language="javascript">
                 i=11692
             </script>
-            <script type="text/javascript" language="javascript" src="http://t4.trackalyzer.com/trackalyze.js"></script>
+            <script type="text/javascript" language="javascript" src="http://t4.trackalyzer.com/trackalyze.js"/>
         </head>
         <menu name="Overview">
             <item name="Home" href="index.html"/>