diff --git a/README.rst b/README.rst
index 2b012db02..1d865ec79 100644
--- a/README.rst
+++ b/README.rst
@@ -1,8 +1,8 @@
-.. image:: https://travis-ci.org/sampsyo/beets.svg?branch=master
-    :target: https://travis-ci.org/sampsyo/beets
+.. image:: https://travis-ci.org/beetbox/beets.svg?branch=master
+    :target: https://travis-ci.org/beetbox/beets
 
-.. image:: http://img.shields.io/codecov/c/github/sampsyo/beets.svg
-    :target: https://codecov.io/github/sampsyo/beets
+.. image:: http://img.shields.io/codecov/c/github/beetbox/beets.svg
+    :target: https://codecov.io/github/beetbox/beets
 
 .. image:: http://img.shields.io/pypi/v/beets.svg
     :target: https://pypi.python.org/pypi/beets
diff --git a/beetsplug/discogs.py b/beetsplug/discogs.py
index d3088d218..321fbd09e 100644
--- a/beetsplug/discogs.py
+++ b/beetsplug/discogs.py
@@ -196,7 +196,7 @@ class DiscogsPlugin(BeetsPlugin):
         # album title. Use `re.UNICODE` flag to avoid stripping non-english
         # word characters.
         # TEMPORARY: Encode as ASCII to work around a bug:
-        # https://github.com/sampsyo/beets/issues/1051
+        # https://github.com/beetbox/beets/issues/1051
         # When the library is fixed, we should encode as UTF-8.
         query = re.sub(r'(?u)\W+', ' ', query).encode('ascii', "replace")
         # Strip medium information from query, Things like "CD1" and "disk 1"
diff --git a/docs/changelog.rst b/docs/changelog.rst
index 479546068..3a7804dd0 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -2220,7 +2220,7 @@ release.
 * Significant internal restructuring to avoid SQLite locking errors. As part of
   these changes, the not-very-useful "save" plugin event has been removed.
 
-.. _pyacoustid: https://github.com/sampsyo/pyacoustid
+.. _pyacoustid: https://github.com/beetbox/pyacoustid
 
 
 1.0b13 (March 16, 2012)
diff --git a/docs/conf.py b/docs/conf.py
index a63622079..cd533a4d8 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -20,7 +20,7 @@ pygments_style = 'sphinx'
 
 # External links to the bug tracker.
 extlinks = {
-    'bug': ('https://github.com/sampsyo/beets/issues/%s', '#'),
+    'bug': ('https://github.com/beetbox/beets/issues/%s', '#'),
     'user': ('https://github.com/%s', ''),
 }
 
diff --git a/docs/faq.rst b/docs/faq.rst
index 050461587..1d0829cd1 100644
--- a/docs/faq.rst
+++ b/docs/faq.rst
@@ -138,13 +138,13 @@ it's helpful to run on the "bleeding edge". To run the latest source:
 2. Install from source. There are a few easy ways to do this:
 
    -  Use ``pip`` to install the latest snapshot tarball: just type
-      ``pip install https://github.com/sampsyo/beets/tarball/master``.
+      ``pip install https://github.com/beetbox/beets/tarball/master``.
    -  Grab the source using Git:
-      ``git clone https://github.com/sampsyo/beets.git``. Then
+      ``git clone https://github.com/beetbox/beets.git``. Then
       ``cd beets`` and type ``python setup.py install``.
    -  Use ``pip`` to install an "editable" version of beets based on an
       automatic source checkout. For example, run
-      ``pip install -e git+https://github.com/sampsyo/beets#egg=beets``
+      ``pip install -e git+https://github.com/beetbox/beets#egg=beets``
       to clone beets and install it, allowing you to modify the source
       in-place to try out changes.
 
@@ -157,8 +157,8 @@ pages.
 …report a bug in beets?
 -----------------------
 
-We use the `issue tracker <https://github.com/sampsyo/beets/issues>`__
-on GitHub. `Enter a new issue <https://github.com/sampsyo/beets/issues/new>`__
+We use the `issue tracker <https://github.com/beetbox/beets/issues>`__
+on GitHub. `Enter a new issue <https://github.com/beetbox/beets/issues/new>`__
 there to report a bug. Please follow these guidelines when reporting an issue:
 
 -  Most importantly: if beets is crashing, please `include the
@@ -325,7 +325,7 @@ integrity---for example, type ``metaflac --list music.flac`` to check
 FLAC files.
 
 If beets still complains about a file that seems to be valid, `file a
-bug <https://github.com/sampsyo/beets/issues/new>`__ and we'll look into
+bug <https://github.com/beetbox/beets/issues/new>`__ and we'll look into
 it. There's always a possibility that there's a bug "upstream" in the
 `Mutagen <http://code.google.com/p/mutagen/>`__ library used by beets,
 in which case we'll forward the bug to that project's tracker.
diff --git a/docs/guides/main.rst b/docs/guides/main.rst
index 6e003705e..2d80eb2fd 100644
--- a/docs/guides/main.rst
+++ b/docs/guides/main.rst
@@ -101,7 +101,7 @@ trouble or you have more detail to contribute here, please direct it to
 `the mailing list`_.
 
 .. _install Python: http://python.org/download/
-.. _beets.reg: https://github.com/sampsyo/beets/blob/master/extra/beets.reg
+.. _beets.reg: https://github.com/beetbox/beets/blob/master/extra/beets.reg
 .. _install pip: http://www.pip-installer.org/en/latest/installing.html#install-pip
 .. _get-pip.py: https://raw.github.com/pypa/pip/master/contrib/get-pip.py
 
diff --git a/docs/guides/tagger.rst b/docs/guides/tagger.rst
index c557bbcaf..4a4c56184 100644
--- a/docs/guides/tagger.rst
+++ b/docs/guides/tagger.rst
@@ -76,7 +76,7 @@ all of these limitations.
   Musepack, Windows Media, Opus, and AIFF files are supported. (Do you use
   some other format? Please `file a feature request`_!)
 
-.. _file a feature request: https://github.com/sampsyo/beets/issues/new
+.. _file a feature request: https://github.com/beetbox/beets/issues/new
 
 Now that that's out of the way, let's tag some music.
 
@@ -281,7 +281,7 @@ MusicBrainz---so consider adding the data yourself.
 If you think beets is ignoring an album that's listed in MusicBrainz, please
 `file a bug report`_.
 
-.. _file a bug report: https://github.com/sampsyo/beets/issues
+.. _file a bug report: https://github.com/beetbox/beets/issues
 
 I Hope That Makes Sense
 -----------------------
diff --git a/docs/index.rst b/docs/index.rst
index 9f1eafd8c..772869389 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -19,7 +19,7 @@ improved.
 
 .. _beets: http://beets.io/
 .. _the mailing list: http://groups.google.com/group/beets-users
-.. _file a bug: https://github.com/sampsyo/beets/issues
+.. _file a bug: https://github.com/beetbox/beets/issues
 
 Contents
 --------
diff --git a/docs/plugins/chroma.rst b/docs/plugins/chroma.rst
index 2f52aa858..b2a9f90c6 100644
--- a/docs/plugins/chroma.rst
+++ b/docs/plugins/chroma.rst
@@ -77,8 +77,8 @@ You will also need a mechanism for decoding audio files supported by the
 
 * On Windows, try the Gstreamer "WinBuilds" from the `OSSBuild`_ project.
 
-.. _audioread: https://github.com/sampsyo/audioread
-.. _pyacoustid: http://github.com/sampsyo/pyacoustid
+.. _audioread: https://github.com/beetbox/audioread
+.. _pyacoustid: http://github.com/beetbox/pyacoustid
 .. _FFmpeg: http://ffmpeg.org/
 .. _MAD: http://spacepants.org/src/pymad/
 .. _pymad: http://www.underbit.com/products/mad/
diff --git a/docs/plugins/discogs.rst b/docs/plugins/discogs.rst
index 038718f9b..eb60cca58 100644
--- a/docs/plugins/discogs.rst
+++ b/docs/plugins/discogs.rst
@@ -30,7 +30,7 @@ Troubleshooting
 
 Several issues have been encountered with the Discogs API. If you have one,
 please start by searching for `a similar issue on the repo
-<https://github.com/sampsyo/beets/issues?utf8=%E2%9C%93&q=is%3Aissue+discogs>`_.
+<https://github.com/beetbox/beets/issues?utf8=%E2%9C%93&q=is%3Aissue+discogs>`_.
 
 Here are two things you can try:
 
diff --git a/docs/plugins/lastgenre.rst b/docs/plugins/lastgenre.rst
index 9d3242467..bd3aebc83 100644
--- a/docs/plugins/lastgenre.rst
+++ b/docs/plugins/lastgenre.rst
@@ -37,7 +37,7 @@ Wikipedia`_.
 .. _pip: http://www.pip-installer.org/
 .. _pylast: http://code.google.com/p/pylast/
 .. _script that scrapes Wikipedia: https://gist.github.com/1241307
-.. _internal whitelist: https://raw.githubusercontent.com/sampsyo/beets/master/beetsplug/lastgenre/genres.txt
+.. _internal whitelist: https://raw.githubusercontent.com/beetbox/beets/master/beetsplug/lastgenre/genres.txt
 
 Canonicalization
 ^^^^^^^^^^^^^^^^
diff --git a/docs/plugins/mpdstats.rst b/docs/plugins/mpdstats.rst
index 1f74a0976..4389fa27e 100644
--- a/docs/plugins/mpdstats.rst
+++ b/docs/plugins/mpdstats.rst
@@ -95,4 +95,4 @@ Warning
 This has only been tested with MPD versions >= 0.16.  It may not work
 on older versions.  If that is the case, please report an `issue`_.
 
-.. _issue: https://github.com/sampsyo/beets/issues
+.. _issue: https://github.com/beetbox/beets/issues
diff --git a/docs/reference/cli.rst b/docs/reference/cli.rst
index 5eb440316..c072c0c0f 100644
--- a/docs/reference/cli.rst
+++ b/docs/reference/cli.rst
@@ -439,7 +439,7 @@ defines some bash-specific functions to make this work without errors::
     _filedir() { :; }
     eval "$(beet completion)"
 
-.. _completion script: https://github.com/sampsyo/beets/blob/master/extra/_beet
+.. _completion script: https://github.com/beetbox/beets/blob/master/extra/_beet
 
 
 .. only:: man
diff --git a/test/test_lyrics.py b/test/test_lyrics.py
index d1f1f05a7..bd2e69e97 100644
--- a/test/test_lyrics.py
+++ b/test/test_lyrics.py
@@ -380,7 +380,7 @@ class LyricsGooglePluginTest(unittest.TestCase):
         """Ensure that `is_page_candidate` doesn't crash when the artist
         and such contain special regular expression characters.
         """
-        # https://github.com/sampsyo/beets/issues/1673
+        # https://github.com/beetbox/beets/issues/1673
         s = self.source
         url = s['url'] + s['path']
         url_title = u'foo'