diff --git a/CHANGES.rst b/CHANGES.rst
index aa5dd11..f9095ba 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -17,24 +17,24 @@ debops.samba v0.1.0 - unreleased
 Added
 ~~~~~
 
-- First release. [drybjed]
+- First release. [drybjed_]
 
-- Changelog. [ypid]
+- Changelog. [ypid_]
 
 - Support to configure :file:`/etc/samba/smb.conf` without
-  installing the Samba daemon. [ypid]
+  installing the Samba daemon. [ypid_]
 
 - Put kernel modules loaded by this role to a separate file under
-  :file:`/etc/modules-load.d` managed by this role. [ypid]
+  :file:`/etc/modules-load.d` managed by this role. [ypid_]
 
 - Allow to change "name resolve order" in the global section using
-  :envvar:`samba__name_resolve_order`. [ypid]
+  :envvar:`samba__name_resolve_order`. [ypid_]
 
 Changed
 ~~~~~~~
 
 - Converted :file:`defaults/main.yml` to new documentation format and improved
-  documentation. [ypid]
+  documentation. [ypid_]
 
 - Changed variable namespace from ``samba_`` to ``samba__``.
   ``samba_[^_]`` variables are hereby deprecated.
@@ -46,4 +46,4 @@ Changed
 
      git ls-files -z | xargs --null -I '{}' find '{}' -type f -print0 | xargs --null sed --in-place --regexp-extended 's/\<(samba)_([^_])/\1__\2/g;'
 
-  [ypid]
+  [ypid_]
diff --git a/defaults/main.yml b/defaults/main.yml
index 3afe51d..2895ad0 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -16,7 +16,7 @@
 # List of base packages to install.
 # In case you only want to prepare the host for being a Samba client, remove
 # the ``samba`` package from the list. This might be required because
-# applications like ownCloud depend on the ``smbclient`` which gets things like
+# applications like ownCloud depend on the :command:`smbclient` which gets things like
 # workgroup from the file :file:`/etc/samba/smb.conf`.
 samba__base_packages:
   - 'samba'