diff --git a/.travis.yml b/.travis.yml
index 962f8eee7..b0700ec10 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,19 +7,19 @@ scala:
   - 2.10.7
   - 2.11.12
   - 2.12.8
-  - 2.13.0-RC1
+  - 2.13.0
 jdk:
   - openjdk8
 env:
-  - SCALAJS_VERSION=0.6.27
-  - SCALAJS_VERSION=1.0.0-M7
+  - SCALAJS_VERSION=0.6.28
+  - SCALAJS_VERSION=1.0.0-M8
 matrix:
   exclude:
     - scala: 2.10.7
-      env: SCALAJS_VERSION=1.0.0-M7
+      env: SCALAJS_VERSION=1.0.0-M8
   include:
     - scala: 2.12.8
-      env: SCALAJS_VERSION=0.6.27
+      env: SCALAJS_VERSION=0.6.28
       script:
         - sbt readme/run
 
diff --git a/build.sbt b/build.sbt
index 51de4358e..03b06d939 100644
--- a/build.sbt
+++ b/build.sbt
@@ -6,24 +6,15 @@ lazy val root = project.in(file(".")).
 name := "Scala.js DOM"
 
 crossScalaVersions in ThisBuild := {
-  if (scalaJSVersion.startsWith("1.")) Seq("2.12.8", "2.11.12", "2.13.0-RC1")
-  else Seq("2.12.8", "2.11.12", "2.10.7", "2.13.0-RC1")
+  if (scalaJSVersion.startsWith("1.")) Seq("2.12.8", "2.11.12", "2.13.0")
+  else Seq("2.12.8", "2.11.12", "2.10.7", "2.13.0")
 }
 scalaVersion in ThisBuild := crossScalaVersions.value.head
 
 val commonSettings = Seq(
   version := "0.9.8-SNAPSHOT",
   organization := "org.scala-js",
-  scalacOptions ++= Seq("-deprecation", "-feature", "-Xfatal-warnings"),
-
-  // Work around https://github.com/scala-js/scala-js/issues/3612
-  scalacOptions in (Compile, doc) := {
-    val prev = (scalacOptions in (Compile, doc)).value
-    if (scalaJSVersion.startsWith("0.6.") && scalaVersion.value.startsWith("2.13."))
-      prev.filter(_ != "-Xfatal-warnings")
-    else
-      prev
-  }
+  scalacOptions ++= Seq("-deprecation", "-feature", "-Xfatal-warnings")
 )
 
 normalizedName := "scalajs-dom"
diff --git a/project/build.sbt b/project/build.sbt
index a8e63782e..f112b9d72 100644
--- a/project/build.sbt
+++ b/project/build.sbt
@@ -1,5 +1,5 @@
 val scalaJSVersion =
-  Option(System.getenv("SCALAJS_VERSION")).getOrElse("0.6.27")
+  Option(System.getenv("SCALAJS_VERSION")).getOrElse("0.6.28")
 
 addSbtPlugin("org.scala-js" % "sbt-scalajs" % scalaJSVersion)