diff --git a/extensions/amd/cl_amd_device_attribute_query.txt b/extensions/amd/cl_amd_device_attribute_query.txt
index cabdb35..6ed85d7 100644
--- a/extensions/amd/cl_amd_device_attribute_query.txt
+++ b/extensions/amd/cl_amd_device_attribute_query.txt
@@ -120,9 +120,26 @@
 
         CL_DEVICE_AVAILABLE_ASYNC_QUEUES_AMD            0x404C
 
+    Return the preferred work group size:
+
+        CL_DEVICE_PREFERRED_WORK_GROUP_SIZE_AMD         0x4030
+
+    Return the extended maximum work group size
+
+        CL_DEVICE_MAX_WORK_GROUP_SIZE_AMD               0x4031
+
+    Return the preferred constant buffer size
+
+        CL_DEVICE_PREFERRED_CONSTANT_BUFFER_SIZE_AMD    0x4033
+
+    Return the device PCIe ID
+
+        CL_DEVICE_PCIE_ID_AMD                           0x4034
+
 Revision History
 
     Version 1, 2010/03/26 (Laurent Morichetti) - initial extension specification.
     Version 2, 2015/03/08 (Brian Sumner) - update query list
     Version 3, 2015/03/27 (Jon Leech) - add Overview note about benign reuse
         of enum from cl_ext_migrate_memobject (Bug 13603).
+    Version 4, 2018/02/14 (Brian Sumner) - update query list
diff --git a/xml/cl.xml b/xml/cl.xml
index 3f3437e..7d015c5 100644
--- a/xml/cl.xml
+++ b/xml/cl.xml
@@ -918,10 +918,12 @@
     <enums namespace="CL" start="0x4030" end="0x403F" vendor="AMD" comment="Per Bug 6075">
             <!-- Note that an unnamed AMD D3D9 extension was intended to use some enums in this range, but was never shipped or published. See bug 6071. -->
             <!-- To be named AMD atomic counters extension - see bug 6071/6075 -->
-        <!-- <enum value="0x4030"      name="CL_DEVICE_PARENT_DEVICE_EXT"/> -->
-        <!-- <enum value="0x4031"      name="CL_DEVICE_PARTITION_STYLE_EXT"/> -->
+        <enum value="0x4030"      name="CL_DEVICE_PREFERRED_WORK_GROUP_SIZE_AMD"/>
+        <enum value="0x4031"      name="CL_DEVICE_MAX_WORK_GROUP_SIZE_AMD"/>
         <!-- <enum value="0x4032"      name="CL_DEVICE_MAX_ATOMIC_COUNTERS_EXT"/> -->
-            <unused start="0x4033" end="0x4035"/>
+        <enum value="0x4033"      name="CL_DEVICE_PREFERRED_CONSTANT_BUFFER_SIZE_AMD"/>
+        <enum value="0x4034"      name="CL_DEVICE_PCIE_ID_AMD"/>
+        <!-- <enum value="0x4035"      name=""/> -->
         <enum value="0x4036"      name="CL_DEVICE_PROFILING_TIMER_OFFSET_AMD"/>
         <enum value="0x4037"      name="CL_DEVICE_TOPOLOGY_AMD"/>
         <enum value="0x4038"      name="CL_DEVICE_BOARD_NAME_AMD"/>