diff --git a/tools/virsh.pod b/tools/virsh.pod
index 052c7acd0c..90ab47db8a 100644
--- a/tools/virsh.pod
+++ b/tools/virsh.pod
@@ -4288,14 +4288,16 @@ Messages at level ERROR or above
 
 =back
 
-For further information about debugging options consult C<http://libvirt.org/logging.html>
+For further information about debugging options consult
+L<http://libvirt.org/logging.html>
 
 =back
 
 =head1 BUGS
 
 Report any bugs discovered to the libvirt community via the mailing
-list C<http://libvirt.org/contact.html> or bug tracker C<http://libvirt.org/bugs.html>.
+list L<http://libvirt.org/contact.html> or bug tracker
+L<http://libvirt.org/bugs.html>.
 Alternatively report bugs to your software distributor / vendor.
 
 =head1 AUTHORS
diff --git a/tools/virt-admin.pod b/tools/virt-admin.pod
index 411951a2d7..83a8cea3d4 100644
--- a/tools/virt-admin.pod
+++ b/tools/virt-admin.pod
@@ -296,14 +296,16 @@ Messages at level ERROR or above
 
 =back
 
-For further information about debugging options consult C<http://libvirt.org/logging.html>
+For further information about debugging options consult
+L<http://libvirt.org/logging.html>
 
 =back
 
 =head1 BUGS
 
 Report any bugs discovered to the libvirt community via the mailing
-list C<http://libvirt.org/contact.html> or bug tracker C<http://libvirt.org/bugs.html>.
+list L<http://libvirt.org/contact.html> or bug tracker
+L<http://libvirt.org/bugs.html>.
 Alternatively report bugs to your software distributor / vendor.
 
 =head1 AUTHORS
diff --git a/tools/virt-host-validate.pod b/tools/virt-host-validate.pod
index 72f7e6bb46..84917c83b7 100644
--- a/tools/virt-host-validate.pod
+++ b/tools/virt-host-validate.pod
@@ -46,7 +46,8 @@ Daniel P. Berrange
 =head1 BUGS
 
 Report any bugs discovered to the libvirt community via the
-mailing list C<http://libvirt.org/contact.html> or bug tracker C<http://libvirt.org/bugs.html>.
+mailing list L<http://libvirt.org/contact.html> or bug tracker
+L<http://libvirt.org/bugs.html>.
 Alternatively report bugs to your software distributor / vendor.
 
 =head1 COPYRIGHT
@@ -62,6 +63,6 @@ PURPOSE
 
 =head1 SEE ALSO
 
-C<virsh(1)>, C<virt-pki-validate>, C<virt-xml-validate>
+L<virsh(1)>, L<virt-pki-validate(1)>, L<virt-xml-validate(1)>
 
 =cut
diff --git a/tools/virt-login-shell.pod b/tools/virt-login-shell.pod
index 56861f7138..b9abf915c6 100644
--- a/tools/virt-login-shell.pod
+++ b/tools/virt-login-shell.pod
@@ -71,7 +71,8 @@ shell; for example, if libvirtd is not running.
 =head1 BUGS
 
 Report any bugs discovered to the libvirt community via the mailing
-list C<http://libvirt.org/contact.html> or bug tracker C<http://libvirt.org/bugs.html>.
+list L<http://libvirt.org/contact.html> or bug tracker
+L<http://libvirt.org/bugs.html>.
 Alternatively report bugs to your software distributor / vendor.
 
 =head1 AUTHORS
diff --git a/tools/virt-pki-validate.pod b/tools/virt-pki-validate.pod
index 4568bff2cb..5f04318f04 100644
--- a/tools/virt-pki-validate.pod
+++ b/tools/virt-pki-validate.pod
@@ -39,7 +39,8 @@ Richard Jones
 =head1 BUGS
 
 Report any bugs discovered to the libvirt community via the
-mailing list C<http://libvirt.org/contact.html> or bug tracker C<http://libvirt.org/bugs.html>.
+mailing list L<http://libvirt.org/contact.html> or bug tracker
+L<http://libvirt.org/bugs.html>.
 Alternatively report bugs to your software distributor / vendor.
 
 =head1 COPYRIGHT
@@ -55,6 +56,6 @@ PURPOSE
 
 =head1 SEE ALSO
 
-C<virsh(1)>, online PKI setup instructions C<http://libvirt.org/remote.html>
+L<virsh(1)>, online PKI setup instructions L<http://libvirt.org/remote.html>
 
 =cut
diff --git a/tools/virt-sanlock-cleanup.pod b/tools/virt-sanlock-cleanup.pod
index 6e70f45cd6..f80a2818da 100644
--- a/tools/virt-sanlock-cleanup.pod
+++ b/tools/virt-sanlock-cleanup.pod
@@ -27,7 +27,8 @@ Daniel Berrange
 =head1 BUGS
 
 Report any bugs discovered to the libvirt community via the
-mailing list C<http://libvirt.org/contact.html> or bug tracker C<http://libvirt.org/bugs.html>.
+mailing list L<http://libvirt.org/contact.html> or bug tracker
+L<http://libvirt.org/bugs.html>.
 Alternatively report bugs to your software distributor / vendor.
 
 =head1 COPYRIGHT
@@ -43,6 +44,6 @@ PURPOSE
 
 =head1 SEE ALSO
 
-C<virsh(1)>, online instructions C<http://libvirt.org/locking.html>
+L<virsh(1)>, online instructions L<http://libvirt.org/locking.html>
 
 =cut
diff --git a/tools/virt-xml-validate.pod b/tools/virt-xml-validate.pod
index f6b4d70fb3..0a5b7db6e6 100644
--- a/tools/virt-xml-validate.pod
+++ b/tools/virt-xml-validate.pod
@@ -88,7 +88,8 @@ Daniel P.Berrange
 =head1 BUGS
 
 Report any bugs discovered to the libvirt community via the
-mailing list C<http://libvirt.org/contact.html> or bug tracker C<http://libvirt.org/bugs.html>.
+mailing list L<http://libvirt.org/contact.html> or bug tracker
+L<http://libvirt.org/bugs.html>.
 Alternatively report bugs to your software distributor / vendor.
 
 =head1 COPYRIGHT
@@ -105,6 +106,6 @@ PURPOSE
 
 =head1 SEE ALSO
 
-C<virsh(1)>, online XML format descriptions C<http://libvirt.org/format.html>
+L<virsh(1)>, online XML format descriptions L<http://libvirt.org/format.html>
 
 =cut