diff --git a/doc/030_preparing_a_new_repo.rst b/doc/030_preparing_a_new_repo.rst
index 39a3a0744..adac25174 100644
--- a/doc/030_preparing_a_new_repo.rst
+++ b/doc/030_preparing_a_new_repo.rst
@@ -90,7 +90,7 @@ command and enter the same password twice:
    data from a CIFS share is not recommended due to compatibility issues in
    older Linux kernels. Either use another backend or set the environment
    variable `GODEBUG` to `asyncpreemptoff=1`. Refer to GitHub issue
-   `#2659 <https://github.com/restic/restic/issues/2659>`_ for further explanations.
+   :issue:`2659` for further explanations.
 
 SFTP
 ****
diff --git a/doc/040_backup.rst b/doc/040_backup.rst
index 3b1a56bd6..cebb0b196 100644
--- a/doc/040_backup.rst
+++ b/doc/040_backup.rst
@@ -216,6 +216,7 @@ Combined with ``--verbose``, you can see a list of changes:
     Would be added to the repository: 25.551 MiB
 
 .. _backup-excluding-files:
+
 Excluding Files
 ***************
 
diff --git a/doc/conf.py b/doc/conf.py
index 3c0af927b..3fd8dc119 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -106,5 +106,5 @@ html_static_path = ['_static']
 htmlhelp_basename = 'resticdoc'
 
 extlinks = {
-    'issue': ('https://github.com/restic/restic/issues/%s', '#'),
+    'issue': ('https://github.com/restic/restic/issues/%s', '#%s'),
 }