diff --git a/build.sbt b/build.sbt
index 85dfec581..2b6450fe4 100644
--- a/build.sbt
+++ b/build.sbt
@@ -14,7 +14,7 @@ def buildLevelSettings: Seq[Setting[_]] = inThisBuild(Seq(
   description := "sbt is an interactive build tool",
   bintrayOrganization := Some("sbt"),
   bintrayRepository := {
-    if (!isSnapshot.value) "maven-releases"
+    if (publishStatus.value == "releases") "maven-releases"
     else "maven-snapshots"
   },
   bintrayPackage := "sbt",
diff --git a/src/main/conscript/xsbt/launchconfig b/src/main/conscript/xsbt/launchconfig
index 033dc550b..d0f3404a5 100644
--- a/src/main/conscript/xsbt/launchconfig
+++ b/src/main/conscript/xsbt/launchconfig
@@ -15,6 +15,7 @@
   maven-central
   typesafe-ivy-releases: https://repo.typesafe.com/typesafe/ivy-releases/, [organization]/[module]/[revision]/[type]s/[artifact](-[classifier]).[ext], bootOnly
   sbt-ivy-snapshots: https://repo.scala-sbt.org/scalasbt/ivy-snapshots/, [organization]/[module]/[revision]/[type]s/[artifact](-[classifier]).[ext], bootOnly
+  sbt-maven-snapshots: https://repo.scala-sbt.org/scalasbt/maven-snapshots/, bootOnly
 
 [boot]
   directory: ${sbt.boot.directory-${sbt.global.base-${user.home}/.sbt}/boot/}