diff --git a/doc.md b/doc.md
index b719a547..31aa67fc 100644
--- a/doc.md
+++ b/doc.md
@@ -67,7 +67,9 @@ Common Tasks
  * [Updating and Installing Software in VMs](/doc/software-update-vm/)
  * [Backup, Restoration, and Migration](/doc/backup-restore/)
  * [Using Disposable VMs](/doc/dispvm/)
- * [Using and Managing USB Devices](/doc/usb/)
+ * [Using and Managing USB Devices in R3.2](/doc/usb/)
+ * [Using Block or Storage Devices in Qubes R4.0](/doc/block-devices/)
+ * [Using USB  Devices in Qubes R4.0](/doc/usb-devices)
  * [Recording Optical Discs](/doc/recording-optical-discs/)
  * [Managing Application Shortcuts](/doc/managing-appvm-shortcuts/)
  * [Enabling Fullscreen Mode](/doc/full-screen-mode/)
@@ -105,6 +107,7 @@ Security Guides
  * [How to Set Up a Split Bitcoin Wallet in Qubes](/doc/split-bitcoin/)
  * [[Unofficial] Split dm-crypt](https://github.com/rustybird/qubes-split-dm-crypt)
  * [Configuring YubiKey for user authentication](/doc/yubi-key/)
+ * [Implications of using devices](/doc/device-considerations/)
  * [Note regarding password-less root access in VM](/doc/vm-sudo/)
 
 
@@ -133,7 +136,8 @@ Configuration Guides
  * [Creating Custom NetVMs and ProxyVMs](https://theinvisiblethings.blogspot.com/2011/09/playing-with-qubes-networking-for-fun.html)
  * [How to make proxy for individual tcp connection from networkless VM](https://groups.google.com/group/qubes-devel/msg/4ca950ab6d7cd11a)
  * [Adding Bridge Support to the NetVM (EXPERIMENTAL)](/doc/network-bridge-support/)
- * [Assigning PCI Devices to AppVMs](/doc/assigning-devices/)
+ * [Assigning PCI Devices to AppVMs](/doc/pci-devices/)
+ * [Creating a USB qube](/doc/usb-qube-howto/)
  * [Enabling TRIM for SSD disks](/doc/disk-trim/)
  * [Configuring a Network Printer](/doc/network-printer/)
  * [Using External Audio Devices](/doc/external-audio/)
@@ -179,6 +183,7 @@ Reference Pages
  * [Command-Line Tools: Qubes 3.2, domU](/doc/tools/3.2/domU/)
  * [Command-Line Tools: Qubes 4.0, dom0](/doc/tools/4.0/dom0/)
  * [Command-Line Tools: Qubes 4.0, domU](/doc/tools/4.0/domU/)
+ * [Device Handling in Qubes 4.0](/doc/device-handling/)
  * [Glossary of Qubes Terminology](/doc/glossary/)
  * [Qubes Service Framework](/doc/qubes-service/)
  * [Command Execution in VMs (and Qubes RPC)](/doc/qrexec/)