diff --git a/changelog.txt b/changelog.txt
index d0fbb211..fbf10430 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -2,6 +2,29 @@ SPRING WEB SERVICES CHANGELOG
 =============================
 http://www.springframework.org/spring-ws
 
+Changes in version 2.1.4.RELEASE
+--------------------------------
+
+** Bug
+    * [SWS-831] - BspCompliant is always set to true in Wss4jSecurityInterceptor
+    * [SWS-833] - All JMS headers ignored, if the are not contained in CONVERSION_TABLE or prefixed with SOAPJMS_
+    * [SWS-837] - Typo in embedded HTTP server documentation
+    * [SWS-840] - I can't set transformSchemaLocation attribute in MessageDispatcherServlet class through web.xml file
+    * [SWS-844] - WebServiceTemplate(Marshaller marshaller) constructor doesn't call initDefaultStrategies()
+    * [SWS-845] - checkForUtf8ByteOrderMark() will not detect BOM with some TLSv1 implementations
+
+** Improvement
+    * [SWS-644] - ejb 2.1 dependency jar - change to freely available jar in M2 Central
+    * [SWS-835] - HttpComponentsMessageSender inintuitive constructor
+    * [SWS-838] - HttpComponentsMessageSender: Use the PoolingClientConnectionManager instead of the deprecated ThreadSafeClientConnManager
+    * [SWS-839] - Update documentation to use HttpComponentsMessageSender in favour of deprecated CommonsHttpMessageSender
+
+** New Feature
+    * [SWS-832] - Add support for programmatically instantiating MessageDispatcherServlet
+
+** Support
+    * [SWS-841] - NullPointerException on First invocation to Spring WS Service with Nonce
+
 Changes in version 2.1.3.RELEASE
 --------------------------------
 
diff --git a/notes.txt b/notes.txt
index 4661d8c8..0f4f74b3 100644
--- a/notes.txt
+++ b/notes.txt
@@ -1,6 +1,6 @@
 Dear Spring community,
 
-I'm pleased to announce that Spring Web Services 2.1.3.RELEASE has been released!
+I'm pleased to announce that Spring Web Services 2.1.4.RELEASE has been released!
 
 This is the latest GA release in the 2.1 release cycle. It mainly
 consists of bug fixes.
diff --git a/parent/pom.xml b/parent/pom.xml
index e5dc27d4..b2e0a3e1 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -27,17 +27,11 @@
             <url>s3://maven.springframework.org/milestone</url>
         </repository>
 -->
-        <repository>
-            <id>spring-local-repo</id>
-            <url>file:///Users/arjen/Projects/Spring/repo</url>
-        </repository>
-<!--
         <repository>
             <id>spring-release</id>
             <name>Spring Release Repository</name>
             <url>s3://maven.springframework.org/release</url>
         </repository>
--->
         <snapshotRepository>
             <id>spring-snapshot</id>
             <name>Spring Snapshot Repository</name>
@@ -54,10 +48,10 @@
         <url>https://fisheye.springframework.org/browse/spring-ws/trunk</url>
     </scm>
     <properties>
-        <osgi.version>2.1.3.RELEASE</osgi.version>
+        <osgi.version>2.1.4.RELEASE</osgi.version>
         <osgi.range>"${osgi.version:[=.=.=, =.=.+1)}"</osgi.range>
-        <spring.framework.version>3.2.2.RELEASE</spring.framework.version>
-        <spring.framework.osgi.range>"[3.2.2, 4.0.0)"</spring.framework.osgi.range>
+        <spring.framework.version>3.2.4.RELEASE</spring.framework.version>
+        <spring.framework.osgi.range>"[3.2.4, 4.0.0)"</spring.framework.osgi.range>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
     <pluginRepositories>
diff --git a/pom.xml b/pom.xml
index f07565cf..b12826a3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -85,17 +85,11 @@
             <url>s3://maven.springframework.org/milestone</url>
         </repository>
 -->
-        <repository>
-            <id>spring-local-repo</id>
-            <url>file:///Users/arjen/Projects/Spring/repo</url>
-        </repository>
-<!--
         <repository>
             <id>spring-release</id>
             <name>Spring Release Repository</name>
             <url>s3://maven.springframework.org/release</url>
         </repository>
--->
         <snapshotRepository>
             <id>spring-snapshot</id>
             <name>Spring Snapshot Repository</name>
@@ -112,7 +106,7 @@
         <url>https://fisheye.springframework.org/browse/spring-ws/trunk</url>
     </scm>
     <properties>
-        <spring.framework.version>3.2.2.RELEASE</spring.framework.version>
+        <spring.framework.version>3.2.4.RELEASE</spring.framework.version>
     </properties>
     <modules>
         <module>parent</module>
diff --git a/readme.txt b/readme.txt
index 2e936b0a..4ebacf19 100644
--- a/readme.txt
+++ b/readme.txt
@@ -1,4 +1,4 @@
-SPRING WEB SERVICES 2.1.3.RELEASE (April 2013)
+SPRING WEB SERVICES 2.1.4.RELEASE (August 2013)
 -------------------------------
 http://www.springframework.org/spring-ws
 http://forum.springframework.org/forumdisplay.php?f=39
@@ -37,31 +37,31 @@ The following distinct jar files are included in the distribution. This list spe
 third-party dependencies. Libraries in [brackets] are optional, i.e. just necessary for certain functionality. For an 
 exact list of Spring-WS project dependencies see the respective Maven2 pom.xml files.
 
-* spring-ws-core-2.1.3.RELEASE.jar
+* spring-ws-core-2.1.4.RELEASE.jar
 - Contents: The Spring-WS Core
 - Dependencies: Commons Logging, spring-beans, spring-core, spring-context, spring-oxm
                 [Log4J, spring-web, spring-webmvc, SAAJ, JDOM, StAX, Servlet API, JAF, Axiom, DOM4J, XOM, WSDL4J]
 
-* spring-ws-support-2.1.3.RELEASE.jar
+* spring-ws-support-2.1.4.RELEASE.jar
 - Contents: The Spring-WS Support
 - Dependencies: Commons Logging, spring-beans, spring-core, spring-context, spring-core
                 [JMS, JavaMail]
 
-* spring-ws-security-2.1.3.RELEASE.jar
+* spring-ws-security-2.1.4.RELEASE.jar
 - Contents: Spring-WS Security integration
 - Dependencies: Commons Logging, spring-beans, spring-core, spring-context, spring-ws-core
                 [Log4J, xmlsdig, xmlsec, XWS-security, Acegi, WSS4J]
 
-* spring-ws-test-2.1.3.RELEASE.jar
+* spring-ws-test-2.1.4.RELEASE.jar
 - Contents: Spring-WS Testing framework
 - Dependencies: JUnit, XMLUnit
 
-* spring-xml-2.1.3.RELEASE.jar
+* spring-xml-2.1.4.RELEASE.jar
 - Contents: Spring XML utility framework
 - Dependencies: Commons Logging, spring-beans, spring-core
                 [StAX, Xalan, Jaxen]
 
-* spring-ws-2.1.3.RELEASE-all.jar
+* spring-ws-2.1.4.RELEASE-all.jar
 - Contents: Convenient al-in-one jar containing all of the jars described above
 
 
diff --git a/samples/airline/server/pom.xml b/samples/airline/server/pom.xml
index f113fd25..f72b754d 100644
--- a/samples/airline/server/pom.xml
+++ b/samples/airline/server/pom.xml
@@ -60,13 +60,6 @@
             </dependencies>
         </profile>
     </profiles>
-    <repositories>
-        <repository>
-            <id>spring-ext</id>
-            <name>Spring External Dependencies Repository</name>
-            <url>https://springframework.svn.sourceforge.net/svnroot/springframework/repos/repo-ext/</url>
-        </repository>
-    </repositories>
     <build>
         <plugins>
             <plugin>