diff --git a/docs/index.rst b/docs/index.rst
index edd5a6a8..77fbcd03 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -158,36 +158,15 @@ ar71xx-generic
   - Archer C5 (v1) [#ath10k]_
   - Archer C7 (v2) [#ath10k]_
   - CPE210 (v1.0, v1.1)
-  - CPE220 (v1.0, v1.1)
+  - CPE220 (v1.1)
   - CPE510 (v1.0, v1.1)
-  - CPE520 (v1.0, v1.1)
-  - TL-MR13U (v1)
-  - TL-MR3020 (v1)
-  - TL-MR3040 (v1, v2)
-  - TL-MR3220 (v1, v2)
-  - TL-MR3420 (v1, v2)
-  - TL-WA701N/ND (v1, v2)
-  - TL-WA750RE (v1)
-  - TL-WA7510N (v1)
-  - TL-WA801N/ND (v1, v2, v3)
-  - TL-WA830RE (v1, v2)
-  - TL-WA850RE (v1)
-  - TL-WA860RE (v1)
-  - TL-WA901N/ND (v1, v2, v3, v4)
+  - CPE520 (v1.1)
+  - RE450
   - TL-WDR3500 (v1)
   - TL-WDR3600 (v1)
   - TL-WDR4300 (v1)
-  - TL-WR703N (v1)
-  - TL-WR710N (v1, v2, v2.1)
-  - TL-WR740N (v1, v3, v4, v5)
-  - TL-WR741N/ND (v1, v2, v4, v5)
-  - TL-WR743N/ND (v1, v2)
-  - TL-WR801N/ND (v1, v2)
-  - TL-WR841N/ND (v3, v5, v7, v8, v9, v10, v11)
+  - TL-WR710N (v1, v2.1)
   - TL-WR842N/ND (v1, v2, v3)
-  - TL-WR843N/ND (v1)
-  - TL-WR940N (v1, v2, v3, v4)
-  - TL-WR941ND (v2, v3, v4, v5, v6)
   - TL-WR1043N/ND (v1, v2, v3, v4)
   - TL-WR2543N/ND (v1)
   - WBS210 (v1.20)
@@ -206,10 +185,12 @@ ar71xx-generic
   - Nanostation M2/M5 XW
   - Picostation M2/M5
   - Rocket M2/M5
+  - Rocket M2/M5 Ti
   - Rocket M2/M5 XW
   - UniFi AP
   - UniFi AP AC Lite [#ath10k]_
   - UniFi AP AC Pro [#ath10k]_
+  - UniFi AP LR
   - UniFi AP Pro
   - UniFi AP Outdoor
   - UniFi AP Outdoor+
@@ -231,6 +212,40 @@ ar71xx-nand
   - WNDR3700 (v4)
   - WNDR4300 (v1)
 
+ar71xx-tiny
+^^^^^^^^^^^
+
+* D-Link
+
+  - DIR-615 (C1)
+
+* TP-Link
+
+  - TL-MR13U (v1)
+  - TL-MR3020 (v1)
+  - TL-MR3040 (v1, v2)
+  - TL-MR3220 (v1, v2)
+  - TL-MR3420 (v1, v2)
+  - TL-WA701N/ND (v1, v2)
+  - TL-WA730RE (v1)
+  - TL-WA750RE (v1)
+  - TL-WA801N/ND (v1, v2, v3)
+  - TL-WA830RE (v1, v2)
+  - TL-WA850RE (v1)
+  - TL-WA860RE (v1)
+  - TL-WA901N/ND (v1, v2, v3, v4)
+  - TL-WA7210N (v2)
+  - TL-WA7510N (v1)
+  - TL-WR703N (v1)
+  - TL-WR710N (v1, v2, v2.1)
+  - TL-WR740N (v1, v3, v4, v5)
+  - TL-WR741N/ND (v1, v2, v4, v5)
+  - TL-WR743N/ND (v1, v2)
+  - TL-WR841N/ND (v3, v5, v7, v8, v9, v10, v11, v12)
+  - TL-WR843N/ND (v1)
+  - TL-WR940N (v1, v2, v3, v4)
+  - TL-WR941ND (v2, v3, v4, v5, v6)
+
 brcm2708-bcm2708
 ^^^^^^^^^^^^^^^^
 
@@ -257,17 +272,10 @@ x86-generic
 
 See also: :doc:`user/x86`
 
-x86-kvm_guest
-^^^^^^^^^^^^^
+x86-geode
+^^^^^^^^^
 
-* x86-kvm
-
-See also: :doc:`user/x86`
-
-x86-xen_domu
-^^^^^^^^^^^^
-
-* x86-xen
+* x86-geode
 
 See also: :doc:`user/x86`
 
diff --git a/docs/user/x86.rst b/docs/user/x86.rst
index 9364b7ed..a65edfcc 100644
--- a/docs/user/x86.rst
+++ b/docs/user/x86.rst
@@ -22,15 +22,8 @@ The following targets for x86 images exist:
     These images only differ in the image file format, the content is the same. Therefore there is
     only a single `x86-generic` sysupgrade image instead of three.
 
-    Please note that the `x86-generic` image doesn't include VirtIO support, so another virtual NIC
-    like `pcnet32` must be chosen when using VirtualBox.
-
-`x86-kvm`
-    The `x86-kvm` image uses VirtIO as its harddisk and network driver.
-
-`x86-xen_domu`
-    The `x86-xen_domu` target contains the necessary drivers for use in Xen.
+`x86-geode`
+    x86 image for Geode CPUs.
 
 `x86-64`
-    64bit version of `x86-generic`. Also has VirtIO support, so there's no need for an
-    `x86-64-kvm` target.
+    64bit version of `x86-generic`.