Index: docs/AMDGPUUsage.rst
===================================================================
--- docs/AMDGPUUsage.rst
+++ docs/AMDGPUUsage.rst
@@ -673,13 +673,11 @@
   .. table:: AMDGPU ELF Note Records
      :name: amdgpu-elf-note-records-table
 
-     ===== ============================== ======================================
-     Name  Type                           Description
-     ===== ============================== ======================================
-     "AMD" ``NT_AMD_AMDGPU_HSA_METADATA`` <metadata null terminated string>
-     ===== ============================== ======================================
-
-..
+     ======== ====================== ======================================
+     Name     Type                   Description
+     ======== ====================== ======================================
+     "AMDGPU" ``NT_AMDGPU_METADATA`` Metadata in MessagePack format
+     ======== ====================== ======================================
 
   .. table:: AMDGPU ELF Note Record Enumeration Values
      :name: amdgpu-elf-note-record-enumeration-values-table
@@ -687,12 +685,14 @@
      ============================== =====
      Name                           Value
      ============================== =====
-     *reserved*                       0-9
-     ``NT_AMD_AMDGPU_HSA_METADATA``    10
-     *reserved*                        11
+     *reserved*                         0
+     ``NT_AMDGPU_METADATA``             1
      ============================== =====
 
-``NT_AMD_AMDGPU_HSA_METADATA``
+``NT_AMDGPU_METADATA``
+  .. TODO
+     Add description of metadata abi.
+
   Specifies extensible metadata associated with the code objects executed on HSA
   [HSA]_ compatible runtimes such as AMD's ROCm [AMD-ROCm]_. It is required when
   the target triple OS is ``amdhsa`` (see :ref:`amdgpu-target-triples`). See
@@ -989,6 +989,9 @@
 Code Object Metadata
 ~~~~~~~~~~~~~~~~~~~~
 
+  .. TODO
+     This text is outdated. Add description of metadata abi.
+
 The code object metadata specifies extensible metadata associated with the code
 objects executed on HSA [HSA]_ compatible runtimes such as AMD's ROCm
 [AMD-ROCm]_. It is specified by the ``NT_AMD_AMDGPU_HSA_METADATA`` note record