diff --git a/doc/source/user/support-matrix.ini b/doc/source/user/support-matrix.ini
index 699fac7778a8..4f5dd31b053e 100644
--- a/doc/source/user/support-matrix.ini
+++ b/doc/source/user/support-matrix.ini
@@ -1536,6 +1536,38 @@ driver.libvirt-vz-ct=missing
 driver.powervm=missing
 driver.zvm=missing
 
+[operation.encrypted-volume]
+title=Attach encrypted block volume to server
+status=optional
+notes=This is the same as the attach volume operation
+  except with an encrypted block device. Encrypted
+  volumes are controlled via admin-configured volume
+  types in the block storage service. Since attach
+  volume is optional this feature is also optional for
+  compute drivers to support.
+cli=nova volume-attach <server> <volume>
+driver.xenserver=missing
+driver.libvirt-kvm-x86=complete
+driver-notes.libvirt-kvm-x86=For native QEMU decryption of the
+  encrypted volume (and rbd support), QEMU>=2.6.0 and libvirt>=2.2.0
+  are required and only the "luks" type provider is supported. Otherwise
+  both "luks" and "cryptsetup" types are supported but not natively, i.e.
+  not all volume types are supported.
+driver.libvirt-kvm-aarch64=unknown
+driver.libvirt-kvm-ppc64=unknown
+driver.libvirt-kvm-s390x=unknown
+driver.libvirt-qemu-x86=complete
+driver-notes.libvirt-qemu-x86=The same restrictions apply as KVM x86.
+driver.libvirt-lxc=missing
+driver.libvirt-xen=unknown
+driver.vmware=missing
+driver.hyperv=missing
+driver.ironic=missing
+driver.libvirt-vz-vm=unknown
+driver.libvirt-vz-ct=missing
+driver.powervm=missing
+driver.zvm=missing
+
 [operation.trusted-certs]
 title=Validate image with trusted certificates
 status=optional