diff --git a/docs/downloads.html.in b/docs/downloads.html.in
index d503b59eccfe173652676b30248f74ad58c56025..64e20644ef7f5778cc47008b0780b7e61989f639 100644
--- a/docs/downloads.html.in
+++ b/docs/downloads.html.in
@@ -30,10 +30,10 @@
             <a href="https://libvirt.org/sources/">libvirt</a>
           </td>
           <td>
-            <a href="https://libvirt.org/git/?p=libvirt.git;a=summary">libvirt</a>
+            <a href="https://gitlab.com/libvirt/libvirt">gitlab</a>
           </td>
           <td>
-            <a href="https://gitlab.com/libvirt/libvirt">gitlab</a>
+            <a href="https://libvirt.org/git/?p=libvirt.git;a=summary">libvirt</a>
             <a href="https://github.com/libvirt/libvirt">github</a>
           </td>
           <td>
@@ -50,10 +50,10 @@
             <a href="https://libvirt.org/sources/csharp/">libvirt</a>
           </td>
           <td>
-            <a href="https://libvirt.org/git/?p=libvirt-csharp.git;a=summary">libvirt</a>
+            <a href="https://gitlab.com/libvirt/libvirt-csharp">gitlab</a>
           </td>
           <td>
-            <a href="https://gitlab.com/libvirt/libvirt-csharp">gitlab</a>
+            <a href="https://libvirt.org/git/?p=libvirt-csharp.git;a=summary">libvirt</a>
             <a href="https://github.com/libvirt/libvirt-csharp">github</a>
           </td>
           <td></td>
@@ -64,10 +64,10 @@
             <a href="https://libvirt.org/libvirt-go">libvirt</a>
           </td>
           <td>
-            <a href="https://libvirt.org/git/?p=libvirt-go.git;a=summary">libvirt</a>
+            <a href="https://gitlab.com/libvirt/libvirt-go">gitlab</a>
           </td>
           <td>
-            <a href="https://gitlab.com/libvirt/libvirt-go">gitlab</a>
+            <a href="https://libvirt.org/git/?p=libvirt-go.git;a=summary">libvirt</a>
             <a href="https://github.com/libvirt/libvirt-go">github</a>
           </td>
           <td>
@@ -80,10 +80,10 @@
             <a href="https://libvirt.org/sources/java/">libvirt</a>
           </td>
           <td>
-            <a href="https://libvirt.org/git/?p=libvirt-java.git;a=summary">libvirt</a>
+            <a href="https://gitlab.com/libvirt/libvirt-java">gitlab</a>
           </td>
           <td>
-            <a href="https://gitlab.com/libvirt/libvirt-java">gitlab</a>
+            <a href="https://libvirt.org/git/?p=libvirt-java.git;a=summary">libvirt</a>
             <a href="https://github.com/libvirt/libvirt-java">github</a>
           </td>
           <td></td>
@@ -94,10 +94,10 @@
             <a href="https://libvirt.org/sources/ocaml/">libvirt</a>
           </td>
           <td>
-            <a href="https://libvirt.org/git/?p=libvirt-ocaml.git;a=summary">libvirt</a>
+            <a href="https://gitlab.com/libvirt/libvirt-ocaml">gitlab</a>
           </td>
           <td>
-            <a href="https://gitlab.com/libvirt/libvirt-ocaml">gitlab</a>
+            <a href="https://libvirt.org/git/?p=libvirt-ocaml.git;a=summary">libvirt</a>
             <a href="https://github.com/libvirt/libvirt-ocaml">github</a>
           </td>
           <td></td>
@@ -108,10 +108,10 @@
             <a href="https://metacpan.org/release/Sys-Virt/">cpan</a>
           </td>
           <td>
-            <a href="https://libvirt.org/git/?p=libvirt-perl.git;a=summary">libvirt</a>
+            <a href="https://gitlab.com/libvirt/libvirt-perl">gitlab</a>
           </td>
           <td>
-            <a href="https://gitlab.com/libvirt/libvirt-perl">gitlab</a>
+            <a href="https://libvirt.org/git/?p=libvirt-perl.git;a=summary">libvirt</a>
             <a href="https://github.com/libvirt/libvirt-perl">github</a>
           </td>
           <td>
@@ -125,10 +125,10 @@
             <a href="https://libvirt.org/sources/php/">libvirt</a>
           </td>
           <td>
-            <a href="https://libvirt.org/git/?p=libvirt-php.git;a=summary">libvirt</a>
+            <a href="https://gitlab.com/libvirt/libvirt-php">gitlab</a>
           </td>
           <td>
-            <a href="https://gitlab.com/libvirt/libvirt-php">gitlab</a>
+            <a href="https://libvirt.org/git/?p=libvirt-php.git;a=summary">libvirt</a>
             <a href="https://github.com/libvirt/libvirt-php">github</a>
           </td>
           <td></td>
@@ -140,10 +140,10 @@
             <a href="https://pypi.python.org/pypi/libvirt-python">pypi</a>
           </td>
           <td>
-            <a href="https://libvirt.org/git/?p=libvirt-python.git;a=summary">libvirt</a>
+            <a href="https://gitlab.com/libvirt/libvirt-python">gitlab</a>
           </td>
           <td>
-            <a href="https://gitlab.com/libvirt/libvirt-python">gitlab</a>
+            <a href="https://libvirt.org/git/?p=libvirt-python.git;a=summary">libvirt</a>
             <a href="https://github.com/libvirt/libvirt-python">github</a>
           </td>
           <td></td>
@@ -154,10 +154,10 @@
             <a href="https://libvirt.org/sources/ruby/">libvirt</a>
           </td>
           <td>
-            <a href="https://libvirt.org/git/?p=ruby-libvirt.git;a=summary">libvirt</a>
+            <a href="https://gitlab.com/libvirt/ruby-libvirt">gitlab</a>
           </td>
           <td>
-            <a href="https://gitlab.com/libvirt/ruby-libvirt">gitlab</a>
+            <a href="https://libvirt.org/git/?p=ruby-libvirt.git;a=summary">libvirt</a>
             <a href="https://github.com/libvirt/ruby-libvirt">github</a>
           </td>
           <td></td>
@@ -168,10 +168,10 @@
             <a href="https://crates.io/crates/virt">crates.io</a>
           </td>
           <td>
-            <a href="https://libvirt.org/git/?p=libvirt-rust.git;a=summary">libvirt</a>
+            <a href="https://gitlab.com/libvirt/libvirt-rust">gitlab</a>
           </td>
           <td>
-            <a href="https://gitlab.com/libvirt/libvirt-rust">gitlab</a>
+            <a href="https://libvirt.org/git/?p=libvirt-rust.git;a=summary">libvirt</a>
             <a href="https://github.com/libvirt/libvirt-rust">github</a>
           </td>
           <td>
@@ -187,10 +187,10 @@
             <a href="https://libvirt.org/sources/glib/">libvirt</a>
           </td>
           <td>
-            <a href="https://libvirt.org/git/?p=libvirt-glib.git;a=summary">libvirt</a>
+            <a href="https://gitlab.com/libvirt/libvirt-glib">gitlab</a>
           </td>
           <td>
-            <a href="https://gitlab.com/libvirt/libvirt-glib">gitlab</a>
+            <a href="https://libvirt.org/git/?p=libvirt-glib.git;a=summary">libvirt</a>
             <a href="https://github.com/libvirt/libvirt-glib">github</a>
           </td>
           <td></td>
@@ -201,10 +201,10 @@
             <a href="https://libvirt.org/libvirt-go-xml">libvirt</a>
           </td>
           <td>
-            <a href="https://libvirt.org/git/?p=libvirt-go-xml.git;a=summary">libvirt</a>
+            <a href="https://gitlab.com/libvirt/libvirt-go-xml">gitlab</a>
           </td>
           <td>
-            <a href="https://gitlab.com/libvirt/libvirt-go-xml">gitlab</a>
+            <a href="https://libvirt.org/git/?p=libvirt-go-xml.git;a=summary">libvirt</a>
             <a href="https://github.com/libvirt/libvirt-go-xml">github</a>
           </td>
           <td>
@@ -217,10 +217,10 @@
             <a href="https://libvirt.org/sources/dbus/">libvirt</a>
           </td>
           <td>
-            <a href="https://libvirt.org/git/?p=libvirt-dbus.git;a=summary">libvirt</a>
+            <a href="https://gitlab.com/libvirt/libvirt-dbus">gitlab</a>
           </td>
           <td>
-            <a href="https://gitlab.com/libvirt/libvirt-dbus">gitlab</a>
+            <a href="https://libvirt.org/git/?p=libvirt-dbus.git;a=summary">libvirt</a>
             <a href="https://github.com/libvirt/libvirt-dbus">github</a>
           </td>
           <td></td>
@@ -231,10 +231,10 @@
             <a href="https://libvirt.org/sources/consoleproxy/">libvirt</a>
           </td>
           <td>
-            <a href="https://libvirt.org/git/?p=libvirt-console-proxy.git;a=summary">libvirt</a>
+            <a href="https://gitlab.com/libvirt/libvirt-console-proxy">gitlab</a>
           </td>
           <td>
-            <a href="https://gitlab.com/libvirt/libvirt-console-proxy">gitlab</a>
+            <a href="https://libvirt.org/git/?p=libvirt-console-proxy.git;a=summary">libvirt</a>
             <a href="https://github.com/libvirt/libvirt-console-proxy">github</a>
           </td>
           <td></td>
@@ -245,10 +245,10 @@
             <a href="https://libvirt.org/sources/CIM/">libvirt</a>
           </td>
           <td>
-            <a href="https://libvirt.org/git/?p=libvirt-cim.git;a=summary">libvirt</a>
+            <a href="https://gitlab.com/libvirt/libvirt-cim">gitlab</a>
           </td>
           <td>
-            <a href="https://gitlab.com/libvirt/libvirt-cim">gitlab</a>
+            <a href="https://libvirt.org/git/?p=libvirt-cim.git;a=summary">libvirt</a>
             <a href="https://github.com/libvirt/libvirt-cim">github</a>
           </td>
           <td></td>
@@ -259,10 +259,10 @@
             <a href="https://libvirt.org/sources/CIM/">libvirt</a>
           </td>
           <td>
-            <a href="https://libvirt.org/git/?p=libcmpiutil.git;a=summary">libvirt</a>
+            <a href="https://gitlab.com/libvirt/libcmpiutil">gitlab</a>
           </td>
           <td>
-            <a href="https://gitlab.com/libvirt/libcmpiutil">gitlab</a>
+            <a href="https://libvirt.org/git/?p=libcmpiutil.git;a=summary">libvirt</a>
             <a href="https://github.com/libvirt/libcmpiutil">github</a>
           </td>
           <td></td>
@@ -273,10 +273,10 @@
             <a href="https://libvirt.org/sources/snmp/">libvirt</a>
           </td>
           <td>
-            <a href="https://libvirt.org/git/?p=libvirt-snmp.git;a=summary">libvirt</a>
+            <a href="https://gitlab.com/libvirt/libvirt-snmp">gitlab</a>
           </td>
           <td>
-            <a href="https://gitlab.com/libvirt/libvirt-snmp">gitlab</a>
+            <a href="https://libvirt.org/git/?p=libvirt-snmp.git;a=summary">libvirt</a>
             <a href="https://github.com/libvirt/libvirt-snmp">github</a>
           </td>
           <td></td>
@@ -287,10 +287,10 @@
             <a href="https://libvirt.org/sources/sandbox/">libvirt</a>
           </td>
           <td>
-            <a href="https://libvirt.org/git/?p=libvirt-sandbox.git;a=summary">libvirt</a>
+            <a href="https://gitlab.com/libvirt/libvirt-sandbox">gitlab</a>
           </td>
           <td>
-            <a href="https://gitlab.com/libvirt/libvirt-sandbox">gitlab</a>
+            <a href="https://libvirt.org/git/?p=libvirt-sandbox.git;a=summary">libvirt</a>
             <a href="https://github.com/libvirt/libvirt-sandbox">github</a>
           </td>
           <td></td>
@@ -304,10 +304,10 @@
             <a href="https://libvirt.org/sources/tck/">libvirt</a>
           </td>
           <td>
-            <a href="https://libvirt.org/git/?p=libvirt-tck.git;a=summary">libvirt</a>
+            <a href="https://gitlab.com/libvirt/libvirt-tck">gitlab</a>
           </td>
           <td>
-            <a href="https://gitlab.com/libvirt/libvirt-tck">gitlab</a>
+            <a href="https://libvirt.org/git/?p=libvirt-tck.git;a=summary">libvirt</a>
             <a href="https://github.com/libvirt/libvirt-tck">github</a>
           </td>
           <td></td>
@@ -316,10 +316,10 @@
           <td>Test API</td>
           <td></td>
           <td>
-            <a href="https://libvirt.org/git/?p=libvirt-test-API.git;a=summary">libvirt</a>
+            <a href="https://gitlab.com/libvirt/libvirt-test-API">gitlab</a>
           </td>
           <td>
-            <a href="https://gitlab.com/libvirt/libvirt-test-API">gitlab</a>
+            <a href="https://libvirt.org/git/?p=libvirt-test-API.git;a=summary">libvirt</a>
             <a href="https://github.com/libvirt/libvirt-test-API">github</a>
           </td>
           <td></td>
@@ -328,10 +328,10 @@
           <td>Jenkins Config</td>
           <td></td>
           <td>
-            <a href="https://libvirt.org/git/?p=libvirt-jenkins-ci.git;a=summary">libvirt</a>
+            <a href="https://gitlab.com/libvirt/libvirt-jenkins-ci">gitlab</a>
           </td>
           <td>
-            <a href="https://gitlab.com/libvirt/libvirt-jenkins-ci">gitlab</a>
+            <a href="https://libvirt.org/git/?p=libvirt-jenkins-ci.git;a=summary">libvirt</a>
             <a href="https://github.com/libvirt/libvirt-jenkins-ci">github</a>
           </td>
           <td></td>
@@ -340,10 +340,10 @@
           <td>CIM Test</td>
           <td></td>
           <td>
-            <a href="https://libvirt.org/git/?p=cimtest.git;a=summary">libvirt</a>
+            <a href="https://gitlab.com/libvirt/cimtest">gitlab</a>
           </td>
           <td>
-            <a href="https://gitlab.com/libvirt/cimtest">gitlab</a>
+            <a href="https://libvirt.org/git/?p=cimtest.git;a=summary">libvirt</a>
             <a href="https://github.com/libvirt/cimtest">github</a>
           </td>
           <td></td>
@@ -355,10 +355,10 @@
           <td>Publican Brand</td>
           <td></td>
           <td>
-            <a href="https://libvirt.org/git/?p=libvirt-publican.git;a=summary">libvirt</a>
+            <a href="https://gitlab.com/libvirt/libvirt-publican">gitlab</a>
           </td>
           <td>
-            <a href="https://gitlab.com/libvirt/libvirt-publican">gitlab</a>
+            <a href="https://libvirt.org/git/?p=libvirt-publican.git;a=summary">libvirt</a>
             <a href="https://github.com/libvirt/libvirt-publican">github</a>
           </td>
           <td></td>
@@ -367,10 +367,10 @@
           <td>App Development Guide</td>
           <td></td>
           <td>
-            <a href="https://libvirt.org/git/?p=libvirt-appdev-guide.git;a=summary">libvirt</a>
+            <a href="https://gitlab.com/libvirt/libvirt-appdev-guide">gitlab</a>
           </td>
           <td>
-            <a href="https://gitlab.com/libvirt/libvirt-appdev-guide">gitlab</a>
+            <a href="https://libvirt.org/git/?p=libvirt-appdev-guide.git;a=summary">libvirt</a>
             <a href="https://github.com/libvirt/libvirt-appdev-guide">github</a>
           </td>
           <td></td>
@@ -379,10 +379,10 @@
           <td>App Development Guide Python</td>
           <td></td>
           <td>
-            <a href="https://libvirt.org/git/?p=libvirt-appdev-guide-python.git;a=summary">libvirt</a>
+            <a href="https://gitlab.com/libvirt/libvirt-appdev-guide-python">gitlab</a>
           </td>
           <td>
-            <a href="https://gitlab.com/libvirt/libvirt-appdev-guide-python">gitlab</a>
+            <a href="https://libvirt.org/git/?p=libvirt-appdev-guide-python.git;a=summary">libvirt</a>
             <a href="https://github.com/libvirt/libvirt-appdev-guide-python">github</a>
           </td>
           <td></td>
@@ -391,10 +391,10 @@
           <td>virsh Command Reference</td>
           <td></td>
           <td>
-            <a href="https://libvirt.org/git/?p=libvirt-virshcmdref.git;a=summary">libvirt</a>
+            <a href="https://gitlab.com/libvirt/libvirt-virshcmdref">gitlab</a>
           </td>
           <td>
-            <a href="https://gitlab.com/libvirt/libvirt-virshcmdref">gitlab</a>
+            <a href="https://libvirt.org/git/?p=libvirt-virshcmdref.git;a=summary">libvirt</a>
             <a href="https://github.com/libvirt/libvirt-virshcmdref">github</a>
           </td>
           <td></td>