diff --git a/docs/changelog.rst b/docs/changelog.rst
index 695635c06..26a8e5b3e 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -52,7 +52,7 @@ Fixes:
   metadata.
 * :doc:`/plugins/discogs`: Authenticate with the Discogs server. The plugin
   now requires a Discogs account due to new API restrictions. Thanks to
-  multikatt.
+  :user:`multikatt`. :bug:`1027`, :bug:`1040`
 
 
 1.3.8 (September 17, 2014)
diff --git a/docs/conf.py b/docs/conf.py
index e5c81a4c5..a185d9643 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -2,7 +2,7 @@ AUTHOR = u'Adrian Sampson'
 
 # General configuration
 
-extensions = ['sphinx.ext.autodoc']
+extensions = ['sphinx.ext.autodoc', 'sphinx.ext.extlinks']
 
 exclude_patterns = ['_build']
 source_suffix = '.rst'
@@ -16,20 +16,23 @@ release = '1.3.9'
 
 pygments_style = 'sphinx'
 
-# Options for HTML output
+# External links to the bug tracker.
+extlinks = {
+    'bug': ('https://github.com/sampsyo/beets/issues/%s', '#'),
+    'user': ('https://github.com/%s', ''),
+}
 
+# Options for HTML output
 html_theme = 'default'
 htmlhelp_basename = 'beetsdoc'
 
 # Options for LaTeX output
-
 latex_documents = [
     ('index', 'beets.tex', u'beets Documentation',
      AUTHOR, 'manual'),
 ]
 
 # Options for manual page output
-
 man_pages = [
     ('reference/cli', 'beet', u'music tagger and library organizer',
      [AUTHOR], 1),