diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index d653a370..b77784ce 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -13,6 +13,8 @@ lib_xua Change Log
   * ADDED:     Guards to user_hid.h and xua_hid.h
   * ADDED:     UAC1 HID support for AC Stop (End Call), Volume Increment and
     Volume Decrement
+  * CHANGE:    UAC1 HID to report function keys f21 through f24 as specified by
+    customer
 
 0.2.1
 -----
diff --git a/LICENSE.txt b/LICENSE.txt
index 19f8e7cc..d4acef94 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -1,6 +1,6 @@
 Software Release License Agreement
 
-Copyright (c) 2011-2019, XMOS, All rights reserved.
+Copyright (c) 2011-2020, XMOS, All rights reserved.
 
 BY ACCESSING, USING, INSTALLING OR DOWNLOADING THE XMOS SOFTWARE, YOU AGREE TO BE BOUND BY THE FOLLOWING TERMS. IF YOU DO NOT AGREE TO THESE, DO NOT ATTEMPT TO DOWNLOAD, ACCESS OR USE THE XMOS Software.
 
diff --git a/lib_xua/src/core/endpoint0/xua_ep0_descriptors.h b/lib_xua/src/core/endpoint0/xua_ep0_descriptors.h
index 1461fc16..74319030 100644
--- a/lib_xua/src/core/endpoint0/xua_ep0_descriptors.h
+++ b/lib_xua/src/core/endpoint0/xua_ep0_descriptors.h
@@ -564,26 +564,18 @@ unsigned char devQualDesc_Null[] =
 #if( 0 < HID_CONTROLS )
 unsigned char hidReportDescriptor[] = /* Voice Command usage as per request #HUTRR45 */
 {
-    0x15, 0x01,         /* Logical Minimum (1) */
-    0x25, 0x01,         /* Logical Maximum (1) */
-    0x75, 0x01,         /* Report Size (1) */
-    0x05, 0x0c,         /* Usage Page (Consumer Device) */
-    0x09, 0x01,         /* Usage (Consumer Control) */
+    0x05, 0x01,         /* Usage Page (Generic Desktop) */
+    0x09, 0x06,         /* Usage (Keyboard) */
     0xa1, 0x01,         /* Collection (Application) */
-    0x0a, 0x00, 0x02,   /* Usage (Generic GUI Application Controls) */
-    0xa1, 0x02,         /* Collection (Logical) */
-    0x95, 0x01,         /* Report Count (1) */
-    0x0a, 0x21, 0x02,   /* Usage (AC Search) */
-    0x81, 0x40,         /* Input (Data, Ary, Abs, Nul) */
-    0x0a, 0x26, 0x02,   /* Usage (AC Stop) */
-    0x81, 0x40,         /* Input (Data, Ary, Abs, Nul) */
-    0x09, 0xe9,         /* Usage (Volume Increment) */
-    0x81, 0x40,         /* Input (Data, Ary, Abs, Nul) */
-    0x09, 0xea,         /* Usage (Volume Decrement) */
-    0x81, 0x40,         /* Input (Data, Ary, Abs, Nul) */
+    0x75, 0x01,         /* Report Size (1) */
     0x95, 0x04,         /* Report Count (4) */
-    0x81, 0x01,         /* Input (Cnst, Ary, Abs) */
-    0xc0,               /* End collection (Logical) */
+    0x05, 0x07,         /* Usage Page (Key Codes) */
+    0x19, 0x70,         /* Usage Minimum (Keyboard F21) */
+    0x29, 0x73,         /* Usage Maximum (Keyboard F24) */
+    0x15, 0x00,         /* Logical Minimum (0) */
+    0x25, 0x01,         /* Logical Maximum (1) */
+    0x81, 0x02,         /* Input (Data, Var, Abs, No Wrap, Lin, Pref, No Nul) */
+    0x81, 0x01,         /* Input (Cnst, Ary, Abs, No Wrap, Lin, Pref, No Nul) */
     0xc0                /* End collection (Application) */
 };
 #endif
@@ -2669,7 +2661,7 @@ unsigned char cfgDesc_Audio1[] =
     (FS_STREAM_FORMAT_OUTPUT_1_MAXPACKETSIZE&0xff),      /* 4  wMaxPacketSize (Typically 294 bytes)*/
     (FS_STREAM_FORMAT_OUTPUT_1_MAXPACKETSIZE&0xff00)>>8, /* 5  wMaxPacketSize */
     0x01,                                 /* bInterval */
-    0x00,                                 /* bRefresh */ 
+    0x00,                                 /* bRefresh */
 #if (NUM_USB_CHAN_IN == 0) || defined(UAC_FORCE_FEEDBACK_EP)
     ENDPOINT_ADDRESS_IN_FEEDBACK,         /* bSynchAdddress - address of EP used to communicate sync info */
 #else /* Bi-directional in/out device */
@@ -2890,7 +2882,7 @@ unsigned char cfgDesc_Audio1[] =
     0x00,                                 /* 4  bCountryCode */
     0x01,                                 /* 5  bNumDescriptors */
     0x22,                                 /* 6  bDescriptorType[0] (Report) */
-    0x2B,                                 /* 7  wDescriptorLength[0] */
+    0x19,                                 /* 7  wDescriptorLength[0] */
     0x00,                                 /* 8  wDescriptorLength[0] */
 
     /* HID Endpoint descriptor (IN) */