diff --git a/.travis.yml b/.travis.yml
index 854c6df..76f515a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,6 @@
  language: scala
  scala:
-   - "2.11.6"
+   - "2.11.8"
+   - "2.12.0"
  jdk:
-   - oraclejdk7
+   - oraclejdk8
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b654948..26e70ce 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,8 @@
+## v0.5.9 (2016-11-03)
+
+* Cross-compile for scala 2.11 and 2.12
+* Updated dependencies
+
 ## v0.5.8 (2015-12-11)
 
 * Updated scaldi v0.5.7
diff --git a/README.md b/README.md
index 42a6f80..9b15c85 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 
 SBT Configuration:
 
-    libraryDependencies += "org.scaldi" %% "scaldi-jsr330" % "0.5.8"
+    libraryDependencies += "org.scaldi" %% "scaldi-jsr330" % "0.5.9"
 
 [![Build Status](https://travis-ci.org/scaldi/scaldi-jsr330.png)](https://travis-ci.org/scaldi/scaldi-jsr330) [![Maven Central](https://maven-badges.herokuapp.com/maven-central/org.scaldi/scaldi-jsr330_2.11/badge.svg)](https://maven-badges.herokuapp.com/maven-central/org.scaldi/scaldi-jsr330_2.11)
 
diff --git a/build.sbt b/build.sbt
index dea6c81..dcaae17 100644
--- a/build.sbt
+++ b/build.sbt
@@ -1,20 +1,29 @@
 name := "scaldi-jsr330"
 organization := "org.scaldi"
-version := "0.5.9-SNAPSHOT"
+version := "0.5.9"
 
 description := "scaldi-jsr330 - JSR 330 spec implementation for scaldi"
 homepage := Some(url("http://scaldi.org"))
 licenses := Seq("Apache License, ASL Version 2.0" -> url("http://www.apache.org/licenses/LICENSE-2.0"))
 
-scalaVersion := "2.11.6"
+crossScalaVersions := Seq("2.11.8", "2.12.0")
+scalaVersion := "2.12.0"
+
+scalacOptions ++= {
+  if (scalaVersion.value startsWith "2.12")
+    Seq.empty
+  else
+    Seq("-target:jvm-1.7")
+}
+
 scalacOptions ++= Seq("-deprecation", "-feature")
 testOptions += Tests.Argument(TestFrameworks.JUnit, "-v")
 
 libraryDependencies ++= Seq(
-  "org.scaldi" %% "scaldi" % "0.5.7",
+  "org.scaldi" %% "scaldi" % "0.5.8",
   "javax.inject" % "javax.inject" % "1",
 
-  "org.scalatest" %% "scalatest" % "2.2.1" % "test",
+  "org.scalatest" %% "scalatest" % "3.0.0" % "test",
   "com.novocode" % "junit-interface" % "0.11" % "test",
   "javax.inject" % "javax.inject-tck" % "1" % "test"
 )
diff --git a/project/build.properties b/project/build.properties
index a6e117b..27e88aa 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1 +1 @@
-sbt.version=0.13.8
+sbt.version=0.13.13