diff --git a/README.md b/README.md
index 5f9812251..ad21ddb50 100644
--- a/README.md
+++ b/README.md
@@ -44,7 +44,7 @@ The specification also used to be in this repo -- it is now a part of the main r
 
 ## Contributing ##
 Please read the [Scala Pull Request Policy](https://github.com/scala/scala/wiki/Pull-Request-Policy)
-and sign the [CLA](http://typesafe.com/contribute/cla/scala).
+and sign the [CLA](http://www.lightbend.com/contribute/cla/scala).
 
 The branching structure mimics that of [scala/scala](https://github.com/scala/scala):
 branches for 2.11.x, 2.12.x, etc.
diff --git a/project/ScalaDist.scala b/project/ScalaDist.scala
index 3d8dab355..51fc5acfc 100644
--- a/project/ScalaDist.scala
+++ b/project/ScalaDist.scala
@@ -55,7 +55,7 @@ object ScalaDist {
     useNativeZip ++ // use native zip to preserve +x permission on scripts
     Seq(
       name                := "scala",
-      maintainer          := "LAMP/EPFL and Typesafe, Inc. <scala-internals@googlegroups.com>",
+      maintainer          := "LAMP/EPFL and Lightbend, Inc. <scala-internals@googlegroups.com>",
       packageSummary      := "Scala Programming Language Distribution", // this will be spliced into the middle of a sentence --> no period (it also determines sort order, so, no "The" in front)
       packageDescription  := "Have the best of both worlds. Construct elegant class hierarchies for maximum code reuse and extensibility, implement their behavior using higher-order functions. Or anything in-between.",
       crossPaths          := false,
diff --git a/src/linux/copyright b/src/linux/copyright
index 2be8a021b..1d48b9719 100644
--- a/src/linux/copyright
+++ b/src/linux/copyright
@@ -1,7 +1,7 @@
 
 scala
 
-Copyright: LAMP/EPFL and Typesafe, Inc.
+Copyright: LAMP/EPFL and Lightbend, Inc.
 
 The home page of scala package is at: http://github.com/scala/scala-dist.