diff --git a/docs/supported.rst b/docs/supported.rst
index d2a1002..a5cde0e 100644
--- a/docs/supported.rst
+++ b/docs/supported.rst
@@ -6,16 +6,16 @@ Client applications
 ===================
 
 - `khal <http://lostpackets.de/khal/>`_, a calendar application supporting
-  :doc:`vdir`. You can use :py:class:`vdirsyncer.storage.FilesystemStorage`
-  with it.
+  :doc:`vdir <vdir>`. You can use
+  :py:class:`vdirsyncer.storage.FilesystemStorage` with it.
 
 - `khard <http://github.com/scheibler/khard/>`_, a commandline addressbook
-  supporting :doc:`vdir`. You can use
+  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`. There are some pitfalls though, `see the notes on the
-  related issue <https://github.com/hnrysmth/ppl/issues/47>`_.
+  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 graphical calendar app Orage <http://www.kolumbus.fi/~w408237/orage/>`_
   saves a calendar in a single ``.ics`` file. You can use