diff --git a/README.md b/README.md
index adf22f9a..7b023676 100644
--- a/README.md
+++ b/README.md
@@ -158,7 +158,7 @@ easy to fork and contribute any changes back upstream.
 1. Check out rbenv into `~/.rbenv`.
 
     ~~~ sh
-    $ git clone https://github.com/sstephenson/rbenv.git ~/.rbenv
+    $ git clone https://github.com/rbenv/rbenv.git ~/.rbenv
     ~~~
 
 2. Add `~/.rbenv/bin` to your `$PATH` for access to the `rbenv`
@@ -444,7 +444,7 @@ name | default | description
 ## Development
 
 The rbenv source code is [hosted on
-GitHub](https://github.com/sstephenson/rbenv). It's clean, modular,
+GitHub](https://github.com/rbenv/rbenv). It's clean, modular,
 and easy to understand, even if you're not a shell hacker.
 
 Tests are executed using [Bats](https://github.com/sstephenson/bats):
diff --git a/bin/ruby-local-exec b/bin/ruby-local-exec
index 97d0a3df..de57897c 100755
--- a/bin/ruby-local-exec
+++ b/bin/ruby-local-exec
@@ -16,7 +16,7 @@ export RBENV_DIR="${1%/*}"
 
 [ -n "$RBENV_SILENCE_WARNINGS" ] || {
   echo "rbenv: \`ruby-local-exec' is deprecated and will be removed in the next release."
-  echo "       To upgrade: https://github.com/sstephenson/rbenv/wiki/ruby-local-exec"
+  echo "       To upgrade: https://github.com/rbenv/rbenv/wiki/ruby-local-exec"
   echo
 } >&2
 
diff --git a/libexec/rbenv-help b/libexec/rbenv-help
index c899cf0d..e5013d3d 100755
--- a/libexec/rbenv-help
+++ b/libexec/rbenv-help
@@ -152,7 +152,7 @@ if [ -z "$1" ] || [ "$1" == "rbenv" ]; then
   print_summaries commands local global shell install uninstall rehash version versions which whence
   echo
   echo "See \`rbenv help <command>' for information on a specific command."
-  echo "For full documentation, see: https://github.com/sstephenson/rbenv#readme"
+  echo "For full documentation, see: https://github.com/rbenv/rbenv#readme"
 else
   command="$1"
   if [ -n "$(command_path "$command")" ]; then
diff --git a/test/--version.bats b/test/--version.bats
index 9993e6dc..3d7ad5c7 100644
--- a/test/--version.bats
+++ b/test/--version.bats
@@ -49,7 +49,7 @@ git_commit() {
   mkdir -p "$RBENV_ROOT"
   cd "$RBENV_ROOT"
   git init
-  git remote add origin https://github.com/sstephenson/rbenv.git
+  git remote add origin https://github.com/rbenv/rbenv.git
   git_commit
   git tag v0.4.1
   git_commit
@@ -65,7 +65,7 @@ git_commit() {
   mkdir -p "$RBENV_ROOT"
   cd "$RBENV_ROOT"
   git init
-  git remote add origin https://github.com/sstephenson/rbenv.git
+  git remote add origin https://github.com/rbenv/rbenv.git
   git_commit
 
   cd "$RBENV_TEST_DIR"