diff --git a/doc/user/conf.py.in b/doc/user/conf.py.in
index 8238eac1..961bbef6 100644
--- a/doc/user/conf.py.in
+++ b/doc/user/conf.py.in
@@ -41,6 +41,7 @@ release = '@PROJECT_VERSION@'
 extensions = [
     'sphinx.ext.mathjax',
     'sphinx.ext.graphviz',
+    'sphinx.ext.extlinks',
 ]
 
 # Add any paths that contain templates here, relative to this directory.
@@ -168,3 +169,8 @@ from recommonmark.parser import CommonMarkParser
 source_parsers = {
     '.md': CommonMarkParser,
 }
+
+extlinks = { 'commit' :
+		('https://gitlab.freedesktop.org/libinput/libinput/commit/%s',
+			'git commit ')
+}
diff --git a/doc/user/index.rst b/doc/user/index.rst
index 00bad426..d257df90 100644
--- a/doc/user/index.rst
+++ b/doc/user/index.rst
@@ -68,5 +68,4 @@ file for the full license information.
 .....
 About
 .....
-Documentation generated from git commit
-`__GIT_VERSION__ <https://gitlab.freedesktop.org/libinput/libinput/commit/__GIT_VERSION__>`_
+Documentation generated from :commit:`__GIT_VERSION__`.
diff --git a/doc/user/tapping.rst b/doc/user/tapping.rst
index 85fdc1a1..afce206e 100644
--- a/doc/user/tapping.rst
+++ b/doc/user/tapping.rst
@@ -21,9 +21,8 @@ even though some hardware can distinguish between that many fingers.
 Tap-to-click default setting
 ------------------------------------------------------------------------------
 
-Tapping is **disabled** by default on most devices, see [this
-commit](https://gitlab.freedesktop.org/libinput/libinput/commit/2219c12c3aa45b80f235e761e87c17fb9ec70eae)
-because:
+Tapping is **disabled** by default on most devices, see
+:commit:`2219c12c3` because:
 
 - if you don't know that tapping is a thing (or enabled by default), you get
   spurious button events that make the desktop feel buggy.