diff --git a/docs/clients/mpd.rst b/docs/clients/mpd.rst
index dd733af2..c7d6ca7b 100644
--- a/docs/clients/mpd.rst
+++ b/docs/clients/mpd.rst
@@ -167,5 +167,5 @@ projects are a real match made in heaven."
 Partify
 -------
 
-`Partify <http://partify.club/>`_ is a web based MPD client focusing on
+`Partify <https://github.com/fhats/partify>`_ is a web based MPD client focusing on
 making music playing collaborative and social.
diff --git a/docs/conf.py b/docs/conf.py
index 8ef30152..88ff29eb 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -174,10 +174,10 @@ intersphinx_mapping = {
 
 # -- Options for linkcheck builder -------------------------------------------
 
-linkcheck_ignore = [ #Some sites work in browser but linkcheck fails.
+linkcheck_ignore = [  # Some sites work in browser but linkcheck fails.
     r'http://localhost:\d+/',
     r'http://wiki.commonjs.org',
     r'http://vk.com',
     r'http://$']
-linkcheck_anchors = False #This breaks on links that use # for other stuff
-linkcheck_timeout = 30
+
+linkcheck_anchors = False  # This breaks on links that use # for other stuff
diff --git a/docs/ext/backends.rst b/docs/ext/backends.rst
index 492ab842..7a9dc506 100644
--- a/docs/ext/backends.rst
+++ b/docs/ext/backends.rst
@@ -154,7 +154,7 @@ Extension for browsing RSS feeds of podcasts and stream the episodes.
 
 
 Mopidy-Podcast-gpodder
-==========================
+======================
 
 https://github.com/tkem/mopidy-podcast-gpodder
 
diff --git a/docs/ext/web.rst b/docs/ext/web.rst
index b0659b05..9d8693e0 100644
--- a/docs/ext/web.rst
+++ b/docs/ext/web.rst
@@ -118,7 +118,7 @@ To install, run::
 Mopidy-MusicBox-Webclient
 =========================
 
-https://github.com/pimusicbox/Mopidy-MusicBox-Webclient
+https://github.com/pimusicbox/mopidy-musicbox-webclient
 
 The first web client for Mopidy, made with jQuery Mobile by Wouter van Wijk.
 Also the web client used for Wouter's popular `Pi Musicbox
diff --git a/tox.ini b/tox.ini
index 55863275..da6bcc38 100644
--- a/tox.ini
+++ b/tox.ini
@@ -33,7 +33,6 @@ deps =
 deps = -r{toxinidir}/docs/requirements.txt
 changedir = docs
 commands = sphinx-build -b html -d {envtmpdir}/doctrees . {envtmpdir}/html
-           sphinx-build -b linkcheck -d {envtmpdir}/doctrees . {envtmpdir}/html
 
 [testenv:flake8]
 deps =
@@ -41,3 +40,8 @@ deps =
     flake8-import-order
     pep8-naming
 commands = flake8 --show-source --statistics mopidy tests
+
+[testenv:linkcheck]
+deps = -r{toxinidir}/docs/requirements.txt
+changedir = docs
+commands = sphinx-build -b linkcheck -d {envtmpdir}/doctrees . {envtmpdir}/html