diff --git a/.travis.yml b/.travis.yml
index 51e8e9977..50fb3fb36 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,4 +19,4 @@ jdk:
   - oraclejdk8
 
 notifications:
-  email: adriaan.moors@typesafe.com
+  email: adriaan.moors@lightbend.com
diff --git a/LICENSE.md b/LICENSE.md
index c9f2ca8a7..ab370cc81 100644
--- a/LICENSE.md
+++ b/LICENSE.md
@@ -1,5 +1,5 @@
-Copyright (c) 2002-2013 EPFL
-Copyright (c) 2011-2013 Typesafe, Inc.
+Copyright (c) 2002-2016 EPFL
+Copyright (c) 2011-2016 Lightbend, Inc.
 
 All rights reserved.
 
@@ -25,4 +25,4 @@ PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
 PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
 LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
 NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/README.md b/README.md
index 454991678..ac0d527f5 100644
--- a/README.md
+++ b/README.md
@@ -3,15 +3,17 @@ scala-xml [<img src="https://img.shields.io/travis/scala/scala-xml.svg"/>](https
 
 The standard Scala XML library. Please file issues here instead of over at issues.scala-lang.org.
 
-As of Scala 2.11, this library is a separate jar that can be omitted from Scala projects that do not use XML.
-If you are cross-building a project that uses scala-xml with Scala 2.10 and Scala 2.11, take a look [this example](https://github.com/scala/scala-module-dependency-sample).
+Since Scala 2.11, this library is a separate jar that can be omitted from Scala projects that do not use XML.
+If you are cross-building a project that uses scala-xml with both Scala 2.10 and later Scala versions, take a look [this example](https://github.com/scala/scala-module-dependency-sample).
 
-The compiler was decoupled from this particular implementation using the same approach as for comprehensions (xml syntax is desugared into a set of method calls, which unfortunately is only defined by the [implementation](https://github.com/scala/scala/blob/2.11.x/src/compiler/scala/tools/nsc/ast/parser/SymbolicXMLBuilder.scala)). Alternative implementations are welcome!
+The compiler was decoupled from this particular implementation using the same approach as for comprehensions (XML syntax is desugared into a set of method calls, which unfortunately is only defined by the [implementation](https://github.com/scala/scala/blob/2.11.x/src/compiler/scala/tools/nsc/ast/parser/SymbolicXMLBuilder.scala)). Alternative implementations are welcome!
 
 API documentation is available [here](http://www.scala-lang.org/api/current/scala-xml/).
 
 ## Maintenance status
+
 This library is community-maintained. The lead maintainer is [@biswanaths](https://github.com/biswanaths).
 
 ## Security best practices
-The XML spec has some features that are best turned off, to avoid unsavory things like file system access, DoS attacks,... Issue [#17](https://github.com/scala/scala-xml/issues/17) tracks the recommended way of configuring the xml parser used by scala-xml to avoid these. This is by no means an exhaustive list. We'll be happy to incorporate your suggestions -- just comment on the ticket!
+
+The XML spec has some features that are best turned off, to avoid unsavory things like file system access, DoS attacks,... Issue [#17](https://github.com/scala/scala-xml/issues/17) tracks the recommended way of configuring the XML parser used by scala-xml to avoid these. This is by no means an exhaustive list. We'll be happy to incorporate your suggestions -- just comment on the ticket!
diff --git a/build.sbt b/build.sbt
index cb27cd845..1020608f0 100644
--- a/build.sbt
+++ b/build.sbt
@@ -13,7 +13,7 @@ crossScalaVersions         := {
   if (java.startsWith("1.6.") || java.startsWith("1.7."))
     Seq("2.11.8")
   else if (java.startsWith("1.8.") || java.startsWith("1.9."))
-    Seq("2.12.0-RC1")
+    Seq("2.12.1")
   else
     sys.error(s"don't know what Scala versions to build on $java")
 }