diff --git a/docs/supported.rst b/docs/supported.rst
index 38f4a11..f63d8e9 100644
--- a/docs/supported.rst
+++ b/docs/supported.rst
@@ -11,14 +11,14 @@ none of it is regularly tested.
 Calendars
 ---------
 
-- `khal <http://lostpackets.de/khal/>`_, a CLI calendar application supporting
-  :doc:`vdir <vdir>`. You can use
+- khal_, a CLI calendar application supporting :doc:`vdir <vdir>`. You can use
   :py:class:`vdirsyncer.storage.FilesystemStorage` with it.
 
 - Many graphical calendar apps such as dayplanner_, Orage_ or rainlendar_ save
   a calendar in a single ``.ics`` file. You can use
   :py:class:`vdirsyncer.storage.SingleFileStorage` with those.
 
+.. _khal: http://lostpackets.de/khal/
 .. _dayplanner: http://www.day-planner.org/
 .. _Orage: http://www.kolumbus.fi/~w408237/orage/
 .. _rainlendar: http://www.rainlendar.net/
@@ -26,16 +26,22 @@ Calendars
 Contacts
 --------
 
-- `khard <http://github.com/scheibler/khard/>`_, a commandline addressbook
-  supporting :doc:`vdir <vdir>`. You can use
+- khard_, a commandline addressbook supporting :doc:`vdir <vdir>`.  You can use
   :py:class:`vdirsyncer.storage.FilesystemStorage` with it.
 
-- `The ppl addressbook <http://ppladdressbook.org/>`_ uses a storage format
-  similar to :doc:`vdir <vdir>`. There are some pitfalls though, `see the notes
-  on the related issue <https://github.com/hnrysmth/ppl/issues/47>`_.
+- `The ppl addressbook <ppl>`_ uses a storage format similar to :doc:`vdir
+  <vdir>`. There are some pitfalls though, `see the notes on the related issue
+  <https://github.com/hnrysmth/ppl/issues/47>`_.
 
-- `contactquery.c <https://github.com/t-8ch/snippets/blob/master/contactquery.c>`_,
-  a small program explicitly written for querying vdirs from mutt.
+- contactquery.c_, a small program explicitly written for querying vdirs from
+  mutt.
+
+- mates_, a commandline addressbook supporting :doc:`vdir <vdir>`.
+
+.. _khard: http://github.com/scheibler/khard/
+.. _ppl: http://ppladdressbook.org/
+.. _contactquery.c: https://github.com/t-8ch/snippets/blob/master/contactquery.c
+.. _mates: https://github.com/untitaker/mates.rs
 
 .. _supported-servers: