diff --git a/doc/audio.rst b/doc/audio.rst
index cd181972..8717dead 100644
--- a/doc/audio.rst
+++ b/doc/audio.rst
@@ -46,7 +46,9 @@ For libvirt, add a SPICE server:
 
 .. code:: xml
 
-   <graphics type='spice'/>
+   <devices>
+      <graphics type='spice'/>
+   </devices>
 
 and a USB redirection device:
 
diff --git a/doc/install_libvirt.rst b/doc/install_libvirt.rst
index a7c9978f..84484570 100644
--- a/doc/install_libvirt.rst
+++ b/doc/install_libvirt.rst
@@ -122,24 +122,30 @@ To enable SPICE support, add a SPICE graphics server to your virtual machine:
 
 .. code:: xml
 
-  <graphics type='spice'/>
+   <devices>
+     <graphics type='spice'/>
+   </devices>
 
 For a fallback display, set up your video device to use VGA:
 
 .. code:: xml
 
-   <video>
-     <model type="vga"/>
-   </video>
+   <devices>
+     <video>
+       <model type="vga"/>
+     </video>
+   </devices>
 
 For fallback audio support, add a standard Intel HDA audio device:
 
 .. code:: xml
 
-  <sound model='ich9'>
-    <audio id='1'/>
-  </sound>
-  <audio id='1' type='spice'/>
+   <devices>
+     <sound model='ich9'>
+        <audio id='1'/>
+     </sound>
+     <audio id='1' type='spice'/>
+   </devices>
 
 .. _libvirt_memballoon_tweak:
 
@@ -157,7 +163,9 @@ Find the ``<memballoon>`` tag and set its type to ``none``:
 
 .. code:: xml
 
-   <memballoon model="none"/>
+   <devices>
+     <memballoon model="none"/>
+   </devices>
 
 .. _libvirt_additional_tuning:
 
diff --git a/doc/ivshmem_shm.rst b/doc/ivshmem_shm.rst
index b9b9da41..1a0e1e0b 100644
--- a/doc/ivshmem_shm.rst
+++ b/doc/ivshmem_shm.rst
@@ -14,10 +14,12 @@ your virtual machine.
 
 .. code:: xml
 
-   <shmem name='looking-glass'>
-     <model type='ivshmem-plain'/>
-     <size unit='M'>64</size>
-   </shmem>
+   <devices>
+     <shmem name='looking-glass'>
+       <model type='ivshmem-plain'/>
+       <size unit='M'>64</size>
+     </shmem>
+   </devices>
 
 .. note::
   If you are using QEMU directly without libvirt the following arguments are