diff --git a/ivy/src/main/scala/sbt/Resolver.scala b/ivy/src/main/scala/sbt/Resolver.scala
index fb122d0bc..5eefa51c8 100644
--- a/ivy/src/main/scala/sbt/Resolver.scala
+++ b/ivy/src/main/scala/sbt/Resolver.scala
@@ -147,7 +147,7 @@ sealed trait JavaNet1Repository extends Resolver
 object Resolver
 {
 	val TypesafeRepositoryRoot = "http://repo.typesafe.com/typesafe"
-	val SbtPluginRepositoryRoot = "http://scalasbt.artifactoryonline.com/scalasbt"
+	val SbtPluginRepositoryRoot = "http://repo.scala-sbt.org/scalasbt"
 	val SonatypeRepositoryRoot = "https://oss.sonatype.org/content/repositories"
 
 	// obsolete: kept only for launcher compatibility
diff --git a/src/sphinx/Community/Community-Plugins.rst b/src/sphinx/Community/Community-Plugins.rst
index d66a82218..cfcdbfd05 100644
--- a/src/sphinx/Community/Community-Plugins.rst
+++ b/src/sphinx/Community/Community-Plugins.rst
@@ -29,7 +29,7 @@ You'll also need to add your credentials somewhere.  For example, you might use
 ::
 
      credentials += Credentials("Artifactory Realm", 
- "scalasbt.artifactoryonline.com", "@user name@", "@my encrypted password@")
+ "repo.scala-sbt.org", "@user name@", "@my encrypted password@")
  
 Where `@my encrypted password@` is actually obtained using the following `instructions <http://wiki.jfrog.org/confluence/display/RTF/Centrally+Secure+Passwords>`_.
  
diff --git a/src/sphinx/conf.py b/src/sphinx/conf.py
index d7a71d52c..59ca2ebfd 100644
--- a/src/sphinx/conf.py
+++ b/src/sphinx/conf.py
@@ -76,7 +76,7 @@ typesafe_ivy_snapshots = typesafe_base + 'ivy-snapshots/'
 typesafe_ivy_releases = typesafe_base + 'ivy-releases/'
 launcher_release_base = typesafe_ivy_releases + 'org.scala-sbt/sbt-launch/'
 launcher_snapshots_base = typesafe_ivy_snapshots + 'org.scala-sbt/sbt-launch/'
-sbt_native_package_base = 'http://scalasbt.artifactoryonline.com/scalasbt/sbt-native-packages/org/scala-sbt/sbt/'
+sbt_native_package_base = 'http://repo.scala-sbt.org/scalasbt/sbt-native-packages/org/scala-sbt/sbt/'
 
 
 rst_epilog = """