diff --git a/main/Opts.scala b/main/Opts.scala
index c8ceebfef..7f0e47446 100644
--- a/main/Opts.scala
+++ b/main/Opts.scala
@@ -29,5 +29,7 @@ object DefaultOptions {
 	def scalac: Seq[String] = compile.encoding("UTF-8")
 	def javadoc(name: String, version: String): Seq[String] = Seq("-doctitle", "%s %s API".format(name, version))
 	def scaladoc(name: String, version: String): Seq[String] = doc.title(name) ++ doc.version(version)
-	def credentials: Credentials = Credentials(userHome / ".sbt" / ".credentials")
+	@deprecated("Use `credentials(State)` instead.", "0.12.0")
+	def credentials: Credentials = Credentials(userHome / ".ivy2" / ".credentials")
+	def credentials(s: State): Credentials = Credentials(BuildPaths.getGlobalBase(s) / ".credentials")
 }