diff --git a/project/Release.scala b/project/Release.scala
index ee347fb98..11c5c2a0e 100644
--- a/project/Release.scala
+++ b/project/Release.scala
@@ -2,6 +2,7 @@ import sbt._
 import Keys._
 import Status.{ publishStatus }
 import org.apache.ivy.util.url.CredentialsStore
+import com.typesafe.sbt.JavaVersionCheckPlugin.autoImport._
 
 object Release extends Build {
   lazy val remoteBase = SettingKey[String]("remote-base")
@@ -57,4 +58,8 @@ object Release extends Build {
         case None        => error("No credentials defined for " + PublishRepoHost)
       }
     }
+
+  def javaVersionCheckSettings = Seq(
+    javaVersionPrefix in javaVersionCheck := Some("1.6")
+  )
 }
diff --git a/project/Sbt.scala b/project/Sbt.scala
index 5b2453dfb..a72566412 100644
--- a/project/Sbt.scala
+++ b/project/Sbt.scala
@@ -290,7 +290,7 @@ object Sbt extends Build {
   def releaseSettings = Release.settings(nonRoots, proguard in Proguard)
   def rootSettings = releaseSettings ++ fullDocSettings ++ LaunchProguard.settings ++ LaunchProguard.specific(launchSub) ++
     Util.publishPomSettings ++ otherRootSettings ++ proguardedLauncherSettings ++ Formatting.sbtFilesSettings ++
-    Transform.conscriptSettings(launchSub)
+    Transform.conscriptSettings(launchSub) ++ Release.javaVersionCheckSettings
   def otherRootSettings = Seq(
     scripted <<= scriptedTask,
     scriptedUnpublished <<= scriptedUnpublishedTask,
diff --git a/project/Util.scala b/project/Util.scala
index 0d21158ee..6c9ed8754 100644
--- a/project/Util.scala
+++ b/project/Util.scala
@@ -41,7 +41,7 @@ object Util {
     name := nameString,
     resolvers += Resolver.typesafeIvyRepo("releases")
   )
-  def minProject(path: File, nameString: String) = Project(normalize(nameString), path) settings (commonSettings(nameString) ++ publishPomSettings: _*)
+  def minProject(path: File, nameString: String) = Project(normalize(nameString), path) settings (commonSettings(nameString) ++ publishPomSettings ++ Release.javaVersionCheckSettings: _*)
   def baseProject(path: File, nameString: String) = minProject(path, nameString) settings (base: _*)
   def testedBaseProject(path: File, nameString: String) = baseProject(path, nameString) settings (testDependencies)
 
@@ -174,7 +174,7 @@ object Common {
   def lib(m: ModuleID) = libraryDependencies += m
   lazy val jlineDep = "jline" % "jline" % "2.11"
   lazy val jline = lib(jlineDep)
-  lazy val ivy = lib("org.scala-sbt.ivy" % "ivy" % "2.3.0-sbt-fac2aaab6f982c4424b47e6b190190bef50a6f59")
+  lazy val ivy = lib("org.scala-sbt.ivy" % "ivy" % "2.3.0-sbt-14d4d23e25f354cd296c73bfff405544434d5f80")
   lazy val httpclient = lib("commons-httpclient" % "commons-httpclient" % "3.1")
   lazy val jsch = lib("com.jcraft" % "jsch" % "0.1.46" intransitive ())
   lazy val sbinary = libraryDependencies += "org.scala-tools.sbinary" %% "sbinary" % "0.4.2"
diff --git a/project/p.sbt b/project/p.sbt
index dc8def8ac..723e694fb 100644
--- a/project/p.sbt
+++ b/project/p.sbt
@@ -10,3 +10,5 @@ resolvers += "jgit-repo" at "http://download.eclipse.org/jgit/maven"
 addSbtPlugin("com.typesafe.sbt" % "sbt-ghpages" % "0.5.1")
 
 addSbtPlugin("com.typesafe.sbt" % "sbt-scalariform" % "1.3.0")
+
+addSbtPlugin("com.typesafe.sbt" % "sbt-javaversioncheck" % "0.1.0")