diff --git a/changelog.txt b/changelog.txt
index c052fc21..51ea5491 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -2,6 +2,28 @@ SPRING WEB SERVICES CHANGELOG
 =============================
 http://www.springframework.org/spring-ws
 
+Changes in version 2.1.2.RELEASE
+--------------------------------
+
+** Bug
+    * [SWS-797] - XsdSchemaHandlerAdapter does not transform schema locations
+    * [SWS-806] - @ symbol in the content-id is converted to %40. The receiving web server is not able to handle it
+
+** Defect
+    * [SWS-804] - WebServiceMessageReceiverHandlerAdapter not easily overridable to produce SOAP faults
+
+
+** Improvement
+    * [SWS-796] - Ability to specify SAML properties file in Wss4jInterceptor
+    * [SWS-798] - Ensure that only valid Java Identifiers are added to JMS headers
+    * [SWS-803] - WebServiceTemple -> add logRequest method analogue to existing logResponse
+    * [SWS-811] - When using annotation-driven register the SoapHeaderElementMethodArgumentResolver by default.
+    * [SWS-812] - Document @SoapHeader in reference guide
+
+** New Feature
+    * [SWS-807] - Introduce FactoryBean for javax.net.ssl.KeyManagerFactory
+    * [SWS-808] - add support to pass in sslSocketFactory to org.springframework.ws.transport.http.HttpsUrlConnectionMessageSender
+
 Changes in version 2.1.1.RELEASE
 --------------------------------
 
diff --git a/notes.txt b/notes.txt
index 069bec50..8f9a27df 100644
--- a/notes.txt
+++ b/notes.txt
@@ -1,8 +1,8 @@
 Dear Spring community,
 
-I'm pleased to announce that Spring Web Services 2.1.1.RELEASE has been released!
+I'm pleased to announce that Spring Web Services 2.1.2.RELEASE has been released!
 
-This is the second GA release in the 2.1 release cycle. It mainly
+This is the latest GA release in the 2.1 release cycle. It mainly
 consists of bug fixes.
 
 Please see the changelog for more details.
diff --git a/parent/pom.xml b/parent/pom.xml
index 9356c968..fa1c9fe7 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -27,17 +27,17 @@
             <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,7 +54,7 @@
         <url>https://fisheye.springframework.org/browse/spring-ws/trunk</url>
     </scm>
     <properties>
-        <osgi.version>2.1.1.RELEASE</osgi.version>
+        <osgi.version>2.1.2.RELEASE</osgi.version>
         <osgi.range>"${osgi.version:[=.=.=, =.=.+1)}"</osgi.range>
         <spring.framework.version>3.1.3.RELEASE</spring.framework.version>
         <spring.framework.osgi.range>"[3.1.0, 4.0.0)"</spring.framework.osgi.range>
diff --git a/pom.xml b/pom.xml
index 3aeef618..fb9345d1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -85,17 +85,17 @@
             <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>
diff --git a/readme.txt b/readme.txt
index 16758da1..4639483f 100644
--- a/readme.txt
+++ b/readme.txt
@@ -1,4 +1,4 @@
-SPRING WEB SERVICES 2.1.1.RELEASE (September 2012)
+SPRING WEB SERVICES 2.1.2.RELEASE (December 2012)
 -------------------------------
 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.1.RELEASE.jar
+* spring-ws-core-2.1.2.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.1.RELEASE.jar
+* spring-ws-support-2.1.2.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.1.RELEASE.jar
+* spring-ws-security-2.1.2.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.1.RELEASE.jar
+* spring-ws-test-2.1.2.RELEASE.jar
 - Contents: Spring-WS Testing framework
 - Dependencies: JUnit, XMLUnit
 
-* spring-xml-2.1.1.RELEASE.jar
+* spring-xml-2.1.2.RELEASE.jar
 - Contents: Spring XML utility framework
 - Dependencies: Commons Logging, spring-beans, spring-core
                 [StAX, Xalan, Jaxen]
 
-* spring-ws-2.1.1.RELEASE-all.jar
+* spring-ws-2.1.2.RELEASE-all.jar
 - Contents: Convenient al-in-one jar containing all of the jars described above