diff --git a/.travis.yml b/.travis.yml
index 8812d26..6d27c28 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,7 +2,6 @@ language: scala
 
 env:
   global:
-    - PUBLISH_JDK=openjdk6 # admin/build.sh only publishes when running on this jdk
 # Don't commit sensitive files, instead commit a version encrypted with $SECRET,
 # this environment variable is encrypted with this repo's private key and stored below:
 # (See http://docs.travis-ci.com/user/environment-variables/#Secure-Variables.)
@@ -11,11 +10,9 @@ env:
 script:
   - admin/build.sh
 
-scala:
-  - 2.11.2
 jdk:
   - openjdk6
-  - openjdk7
+  - oraclejdk8
 notifications:
   email:
     - adriaan.moors@typesafe.com
diff --git a/admin/build.sh b/admin/build.sh
index 9cd380e..99251c7 100755
--- a/admin/build.sh
+++ b/admin/build.sh
@@ -5,7 +5,7 @@
 # git on travis does not fetch tags, but we have TRAVIS_TAG
 # headTag=$(git describe --exact-match ||:)
 
-if [ "$TRAVIS_JDK_VERSION" == "$PUBLISH_JDK" ] && [[ "$TRAVIS_TAG" =~ ^v[0-9]+\.[0-9]+\.[0-9]+(-[A-Za-z0-9-]+)? ]]; then
+if [[ "$TRAVIS_TAG" =~ ^v[0-9]+\.[0-9]+\.[0-9]+(-[A-Za-z0-9-]+)? ]]; then
   echo "Going to release from tag $TRAVIS_TAG!"
   myVer=$(echo $TRAVIS_TAG | sed -e s/^v//)
   publishVersion='set every version := "'$myVer'"'
@@ -16,4 +16,4 @@ if [ "$TRAVIS_JDK_VERSION" == "$PUBLISH_JDK" ] && [[ "$TRAVIS_TAG" =~ ^v[0-9]+\.
   (cd admin/ && ./decrypt.sh secring.asc)
 fi
 
-sbt ++$TRAVIS_SCALA_VERSION "$publishVersion" compile $extraTarget
\ No newline at end of file
+sbt "$publishVersion" compile $extraTarget
diff --git a/build.sbt b/build.sbt
index 6fe64de..700adda 100644
--- a/build.sbt
+++ b/build.sbt
@@ -1,10 +1,20 @@
 scalaModuleSettings
 
-version                    := "0.7.0-SNAPSHOT"
+version                    := "0.8.0-SNAPSHOT"
 
-scalaVersion               := "2.11.4"
+crossScalaVersions         := {
+  val java = System.getProperty("java.version")
+  if (java.startsWith("1.6."))
+    Seq("2.11.7")
+  else if (java.startsWith("1.8."))
+    Seq("2.12.0-M3")
+  else
+    sys.error(s"don't know what Scala versions to build on $java")
+}
 
-snapshotScalaBinaryVersion := "2.11.4"
+scalaVersion               := crossScalaVersions.value.head
+
+snapshotScalaBinaryVersion := scalaVersion.value
 
 // dependencies:
 libraryDependencies        += "org.scala-sbt" % "test-interface" % "1.0"