diff --git a/_downloads/2016-11-03-2.12.0.md b/_downloads/2016-11-03-2.12.0.md
index 5722ac742..fe585c709 100644
--- a/_downloads/2016-11-03-2.12.0.md
+++ b/_downloads/2016-11-03-2.12.0.md
@@ -6,7 +6,7 @@ release_version: 2.12.0
release_date: "November 03, 2016"
show_resources: "true"
permalink: /download/2.12.0.html
-requirements: "Scala 2.12 requires version 8 of the Java platform, as provided by OpenJDK or Oracle. Java 9 is not yet supported."
+requirements: "Scala 2.12 requires version 8 of the Java platform, as provided by OpenJDK or Oracle. Java 9 is not yet supported."
resources: [
["-main-unixsys", "scala-2.12.0.tgz", "https://downloads.lightbend.com/scala/2.12.0/scala-2.12.0.tgz", "Mac OS X, Unix, Cygwin", "19.24M"],
["-main-windows", "scala-2.12.0.msi", "https://downloads.lightbend.com/scala/2.12.0/scala-2.12.0.msi", "Windows (msi installer)", "117.78M"],
diff --git a/_posts/2016-11-03-release-notes-2.12.0.md b/_posts/2016-11-03-release-notes-2.12.0.md
index c0ab1e861..abc83507a 100644
--- a/_posts/2016-11-03-release-notes-2.12.0.md
+++ b/_posts/2016-11-03-release-notes-2.12.0.md
@@ -57,7 +57,7 @@ We hope to address the following in a later 2.12.x release:
### Java 8 runtime
-Install a recent build of the Java 8 Platform, such as [OpenJDK](http://openjdk.java.net/install/) or [Oracle Java](http://www.oracle.com/technetwork/java/javase/downloads/index.html). Any Java 8 compliant runtime will do (but note that Oracle versions before 8u102 have a known issue that [affects Scala](https://issues.scala-lang.org/browse/SI-9828)).
+Install a recent build of the Java 8 Platform, such as [OpenJDK](http://openjdk.java.net/install/) or [Oracle Java](https://www.oracle.com/technetwork/java/javase/downloads/index.html). Any Java 8 compliant runtime will do (but note that Oracle versions before 8u102 have a known issue that [affects Scala](https://issues.scala-lang.org/browse/SI-9828)).
We are planning to add (some) support for Java 9 in the near future. Full Java 9 support will be part of the 2.13 roadmap discussions.
diff --git a/documentation/your-first-lines-of-scala.md b/documentation/your-first-lines-of-scala.md
index 8aef3da27..bb0628304 100644
--- a/documentation/your-first-lines-of-scala.md
+++ b/documentation/your-first-lines-of-scala.md
@@ -54,7 +54,7 @@ The shortcut `:q` stands for the internal shell command `:quit` used to exit the
### Compile it!
-The `scalac` command compiles one (or more) Scala source file(s) and generates Java bytecode which can be executed on any [standard JVM](http://java.sun.com/docs/books/jvms/). The Scala compiler works similarly to `javac`, the Java compiler of the [Java SDK](http://www.oracle.com/technetwork/java/index.html).
+The `scalac` command compiles one (or more) Scala source file(s) and generates Java bytecode which can be executed on any [standard JVM](http://java.sun.com/docs/books/jvms/). The Scala compiler works similarly to `javac`, the Java compiler of the [Java SDK](https://www.oracle.com/technetwork/java/index.html).
> scalac HelloWorld.scala