diff --git a/docs/manpages/libvirtd.rst b/docs/manpages/libvirtd.rst
index 9a9324ffc2..f066218878 100644
--- a/docs/manpages/libvirtd.rst
+++ b/docs/manpages/libvirtd.rst
@@ -296,4 +296,4 @@ SEE ALSO
 ========
 
 virsh(1), virt-install(1), virt-xml-validate(1), virt-top(1),
-virt-df(1), `https://www.libvirt.org/ <https://www.libvirt.org/>`_
+virt-df(1), `https://libvirt.org/ <https://libvirt.org/>`_
diff --git a/docs/manpages/virt-admin.rst b/docs/manpages/virt-admin.rst
index 479e27b2c2..5108781636 100644
--- a/docs/manpages/virt-admin.rst
+++ b/docs/manpages/virt-admin.rst
@@ -91,7 +91,7 @@ NOTES
 =====
 
 The ``virt-admin`` supports both the monolithic ``libvirtd`` daemon and the
-`modular daemons <https://www.libvirt.org/daemons.html#modular-driver-daemons>`__
+`modular daemons <https://libvirt.org/daemons.html#modular-driver-daemons>`__
 whichever is in use by your system. The connection *URI* used with
 ``-c/--connect`` or the `connect`_ command is based on the name of the
 controlled daemon e.g.: ``virtqemud:///system``, ``libvirtd:///system``.
diff --git a/docs/manpages/virt-pki-query-dn.rst b/docs/manpages/virt-pki-query-dn.rst
index bf809df336..e37629514d 100644
--- a/docs/manpages/virt-pki-query-dn.rst
+++ b/docs/manpages/virt-pki-query-dn.rst
@@ -87,4 +87,4 @@ SEE ALSO
 
 virsh(1), virt-pki-validate(1),
 `online PKI setup instructions <https://libvirt.org/remote.html>`_,
-`https://www.libvirt.org/ <https://www.libvirt.org/>`_
+`https://libvirt.org/ <https://libvirt.org/>`_
diff --git a/docs/manpages/virt-pki-validate.rst b/docs/manpages/virt-pki-validate.rst
index 730c99ec79..063448f48b 100644
--- a/docs/manpages/virt-pki-validate.rst
+++ b/docs/manpages/virt-pki-validate.rst
@@ -86,4 +86,4 @@ SEE ALSO
 ========
 
 virsh(1), `online PKI setup instructions <https://libvirt.org/remote.html>`_,
-`https://www.libvirt.org/ <https://www.libvirt.org/>`_
+`https://libvirt.org/ <https://libvirt.org/>`_
diff --git a/docs/manpages/virt-qemu-sev-validate.rst b/docs/manpages/virt-qemu-sev-validate.rst
index 617ef0a57e..6ec8328126 100644
--- a/docs/manpages/virt-qemu-sev-validate.rst
+++ b/docs/manpages/virt-qemu-sev-validate.rst
@@ -663,4 +663,4 @@ SEE ALSO
 ========
 
 virsh(1), `SEV launch security usage <https://libvirt.org/kbase/launch_security_sev.html>`_,
-`https://www.libvirt.org/ <https://www.libvirt.org/>`_
+`https://libvirt.org/ <https://libvirt.org/>`_
diff --git a/docs/manpages/virtbhyved.rst b/docs/manpages/virtbhyved.rst
index 32e636ce35..895fb97ffe 100644
--- a/docs/manpages/virtbhyved.rst
+++ b/docs/manpages/virtbhyved.rst
@@ -189,5 +189,5 @@ SEE ALSO
 ========
 
 virsh(1), libvirtd(8),
-`https://www.libvirt.org/daemons.html <https://www.libvirt.org/daemons.html>`_,
-`https://www.libvirt.org/drvbhyve.html <https://www.libvirt.org/drvbhyve.html>`_
+`https://libvirt.org/daemons.html <https://libvirt.org/daemons.html>`_,
+`https://libvirt.org/drvbhyve.html <https://libvirt.org/drvbhyve.html>`_
diff --git a/docs/manpages/virtinterfaced.rst b/docs/manpages/virtinterfaced.rst
index 419d523494..bdd4be7d87 100644
--- a/docs/manpages/virtinterfaced.rst
+++ b/docs/manpages/virtinterfaced.rst
@@ -210,5 +210,5 @@ SEE ALSO
 ========
 
 virsh(1), libvirtd(8),
-`https://www.libvirt.org/daemons.html <https://www.libvirt.org/daemons.html>`_,
-`https://www.libvirt.org/drvinterface.html <https://www.libvirt.org/drvinterface.html>`_
+`https://libvirt.org/daemons.html <https://libvirt.org/daemons.html>`_,
+`https://libvirt.org/drvinterface.html <https://libvirt.org/drvinterface.html>`_
diff --git a/docs/manpages/virtlxcd.rst b/docs/manpages/virtlxcd.rst
index 10e2c7035b..709c893ca6 100644
--- a/docs/manpages/virtlxcd.rst
+++ b/docs/manpages/virtlxcd.rst
@@ -194,5 +194,5 @@ SEE ALSO
 ========
 
 virsh(1), libvirtd(8),
-`https://www.libvirt.org/daemons.html <https://www.libvirt.org/daemons.html>`_,
-`https://www.libvirt.org/drvlxc.html <https://www.libvirt.org/drvlxc.html>`_
+`https://libvirt.org/daemons.html <https://libvirt.org/daemons.html>`_,
+`https://libvirt.org/drvlxc.html <https://libvirt.org/drvlxc.html>`_
diff --git a/docs/manpages/virtnetworkd.rst b/docs/manpages/virtnetworkd.rst
index fa3bb8ab45..2932e7c213 100644
--- a/docs/manpages/virtnetworkd.rst
+++ b/docs/manpages/virtnetworkd.rst
@@ -210,5 +210,5 @@ SEE ALSO
 ========
 
 virsh(1), libvirtd(8),
-`https://www.libvirt.org/daemons.html <https://www.libvirt.org/daemons.html>`_,
-`https://www.libvirt.org/drvnetwork.html <https://www.libvirt.org/drvnetwork.html>`_
+`https://libvirt.org/daemons.html <https://libvirt.org/daemons.html>`_,
+`https://libvirt.org/drvnetwork.html <https://libvirt.org/drvnetwork.html>`_
diff --git a/docs/manpages/virtnodedevd.rst b/docs/manpages/virtnodedevd.rst
index 74c539602d..9044946ad6 100644
--- a/docs/manpages/virtnodedevd.rst
+++ b/docs/manpages/virtnodedevd.rst
@@ -209,5 +209,5 @@ SEE ALSO
 ========
 
 virsh(1), libvirtd(8),
-`https://www.libvirt.org/daemons.html <https://www.libvirt.org/daemons.html>`_,
-`https://www.libvirt.org/drvnodedev.html <https://www.libvirt.org/drvnodedev.html>`_
+`https://libvirt.org/daemons.html <https://libvirt.org/daemons.html>`_,
+`https://libvirt.org/drvnodedev.html <https://libvirt.org/drvnodedev.html>`_
diff --git a/docs/manpages/virtnwfilterd.rst b/docs/manpages/virtnwfilterd.rst
index 5998f3084e..c90f71cfd2 100644
--- a/docs/manpages/virtnwfilterd.rst
+++ b/docs/manpages/virtnwfilterd.rst
@@ -210,5 +210,5 @@ SEE ALSO
 ========
 
 virsh(1), libvirtd(8),
-`https://www.libvirt.org/daemons.html <https://www.libvirt.org/daemons.html>`_,
-`https://www.libvirt.org/drvnwfilter.html <https://www.libvirt.org/drvnwfilter.html>`_
+`https://libvirt.org/daemons.html <https://libvirt.org/daemons.html>`_,
+`https://libvirt.org/drvnwfilter.html <https://libvirt.org/drvnwfilter.html>`_
diff --git a/docs/manpages/virtproxyd.rst b/docs/manpages/virtproxyd.rst
index 0ac7ded9c4..814575e504 100644
--- a/docs/manpages/virtproxyd.rst
+++ b/docs/manpages/virtproxyd.rst
@@ -252,4 +252,4 @@ SEE ALSO
 ========
 
 virsh(1), libvirtd(8),
-`https://www.libvirt.org/daemons.html <https://www.libvirt.org/daemons.html>`_,
+`https://libvirt.org/daemons.html <https://libvirt.org/daemons.html>`_,
diff --git a/docs/manpages/virtqemud.rst b/docs/manpages/virtqemud.rst
index 15c5bc4ab5..25cd5361dc 100644
--- a/docs/manpages/virtqemud.rst
+++ b/docs/manpages/virtqemud.rst
@@ -232,5 +232,5 @@ SEE ALSO
 ========
 
 virsh(1), libvirtd(8),
-`https://www.libvirt.org/daemons.html <https://www.libvirt.org/daemons.html>`_,
-`https://www.libvirt.org/drvqemu.html <https://www.libvirt.org/drvqemu.html>`_
+`https://libvirt.org/daemons.html <https://libvirt.org/daemons.html>`_,
+`https://libvirt.org/drvqemu.html <https://libvirt.org/drvqemu.html>`_
diff --git a/docs/manpages/virtsecretd.rst b/docs/manpages/virtsecretd.rst
index a4abb2963c..3c88f9b4d0 100644
--- a/docs/manpages/virtsecretd.rst
+++ b/docs/manpages/virtsecretd.rst
@@ -209,5 +209,5 @@ SEE ALSO
 ========
 
 virsh(1), libvirtd(8),
-`https://www.libvirt.org/daemons.html <https://www.libvirt.org/daemons.html>`_,
-`https://www.libvirt.org/drvsecret.html <https://www.libvirt.org/drvsecret.html>`_
+`https://libvirt.org/daemons.html <https://libvirt.org/daemons.html>`_,
+`https://libvirt.org/drvsecret.html <https://libvirt.org/drvsecret.html>`_
diff --git a/docs/manpages/virtstoraged.rst b/docs/manpages/virtstoraged.rst
index 23e508df50..5164547e88 100644
--- a/docs/manpages/virtstoraged.rst
+++ b/docs/manpages/virtstoraged.rst
@@ -210,5 +210,5 @@ SEE ALSO
 ========
 
 virsh(1), libvirtd(8),
-`https://www.libvirt.org/daemons.html <https://www.libvirt.org/daemons.html>`_,
-`https://www.libvirt.org/drvstorage.html <https://www.libvirt.org/drvstorage.html>`_
+`https://libvirt.org/daemons.html <https://libvirt.org/daemons.html>`_,
+`https://libvirt.org/drvstorage.html <https://libvirt.org/drvstorage.html>`_
diff --git a/docs/manpages/virtvboxd.rst b/docs/manpages/virtvboxd.rst
index 199bffd824..0c551b8c09 100644
--- a/docs/manpages/virtvboxd.rst
+++ b/docs/manpages/virtvboxd.rst
@@ -209,5 +209,5 @@ SEE ALSO
 ========
 
 virsh(1), libvirtd(8),
-`https://www.libvirt.org/daemons.html <https://www.libvirt.org/daemons.html>`_,
-`https://www.libvirt.org/drvvbox.html <https://www.libvirt.org/drvvbox.html>`_
+`https://libvirt.org/daemons.html <https://libvirt.org/daemons.html>`_,
+`https://libvirt.org/drvvbox.html <https://libvirt.org/drvvbox.html>`_
diff --git a/docs/manpages/virtvzd.rst b/docs/manpages/virtvzd.rst
index c9360b944b..a5f351c27e 100644
--- a/docs/manpages/virtvzd.rst
+++ b/docs/manpages/virtvzd.rst
@@ -210,5 +210,5 @@ SEE ALSO
 ========
 
 virsh(1), libvirtd(8),
-`https://www.libvirt.org/daemons.html <https://www.libvirt.org/daemons.html>`_,
-`https://www.libvirt.org/drvvz.html <https://www.libvirt.org/drvvz.html>`_
+`https://libvirt.org/daemons.html <https://libvirt.org/daemons.html>`_,
+`https://libvirt.org/drvvz.html <https://libvirt.org/drvvz.html>`_
diff --git a/docs/manpages/virtxend.rst b/docs/manpages/virtxend.rst
index e3ced780aa..eda210f5dd 100644
--- a/docs/manpages/virtxend.rst
+++ b/docs/manpages/virtxend.rst
@@ -194,5 +194,5 @@ SEE ALSO
 ========
 
 virsh(1), libvirtd(8),
-`https://www.libvirt.org/daemons.html <https://www.libvirt.org/daemons.html>`_,
-`https://www.libvirt.org/drvxen.html <https://www.libvirt.org/drvxen.html>`_
+`https://libvirt.org/daemons.html <https://libvirt.org/daemons.html>`_,
+`https://libvirt.org/drvxen.html <https://libvirt.org/drvxen.html>`_
diff --git a/docs/styleguide.rst b/docs/styleguide.rst
index 34c5b1573a..469f0d8d75 100644
--- a/docs/styleguide.rst
+++ b/docs/styleguide.rst
@@ -181,4 +181,4 @@ RST documents created as manual pages must have the following structure
   ========
 
   ...other man page links....
-  `https://www.libvirt.org/ <https://www.libvirt.org/>`_
+  `https://libvirt.org/ <https://libvirt.org/>`_
diff --git a/src/libvirt-domain-checkpoint.c b/src/libvirt-domain-checkpoint.c
index 81107531b6..e1a922a26f 100644
--- a/src/libvirt-domain-checkpoint.c
+++ b/src/libvirt-domain-checkpoint.c
@@ -114,7 +114,7 @@ virDomainCheckpointGetConnect(virDomainCheckpointPtr checkpoint)
  * kicking off a backup job with virDomainBackupBegin(); however, it
  * is also possible to start a checkpoint without a backup.
  *
- * See https://www.libvirt.org/formatcheckpoint.html#checkpoint-xml
+ * See https://libvirt.org/formatcheckpoint.html#checkpoint-xml
  * for more details on @xmlDesc. In particular, some hypervisors may require
  * particular disk formats, such as qcow2, in order to support this
  * command; where @xmlDesc can be used to limit the checkpoint to a working
diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c
index 9fd13250b1..63829bb028 100644
--- a/src/libvirt-domain.c
+++ b/src/libvirt-domain.c
@@ -13628,7 +13628,7 @@ virDomainAgentSetResponseTimeout(virDomainPtr domain,
  *
  * virDomainBackupGetXMLDesc() can be called to learn actual
  * values selected.  For more information, see
- * https://www.libvirt.org/formatbackup.html#backup-xml
+ * https://libvirt.org/formatbackup.html#backup-xml
  *
  * The @checkpointXML parameter is optional; if non-NULL, then libvirt
  * behaves as if virDomainCheckpointCreateXML() were called to create