diff --git a/configs/ez80f910200kitg/README.txt b/configs/ez80f910200kitg/README.txt
index 83881b09aad69d3b83525b14f15e36a4a96f076e..05f767c791739613f9b6018505dc7c893ffa4b29 100644
--- a/configs/ez80f910200kitg/README.txt
+++ b/configs/ez80f910200kitg/README.txt
@@ -34,6 +34,19 @@ Version 4.11.0
  
    /* Set up global variables */
 
+Version 5.1.1
+
+  On June 22, 2011 I verified that these configurations build successfully
+  with the 5.1.1 ZDS-II version.  All that is required to used ZDS-II is
+  to modify the Make.defs file so that the correct version is used.  That
+  version should also be changed in the (optional) setenv.sh file.
+
+  The above kludge for 4.11.0 is not required.
+
+  I had to make additional changes to the ZDS path in Make.defs (and also
+  in setenv.sh) when the 32-bit ZDS-II tools are installed on my 64-bit
+  Windows 7 system.
+  
 Other Versions
   If you use any version of ZDS-II other than 4.11.0 or if you install ZDS-II
   at any location other than the default location, you will have to modify
diff --git a/configs/ez80f910200zco/README.txt b/configs/ez80f910200zco/README.txt
index ed8ea9e12353724508fdfdb008c7162cbb816e9f..1b2817704698be96e5d7fc8b46cb1e81cf9417f4 100644
--- a/configs/ez80f910200zco/README.txt
+++ b/configs/ez80f910200zco/README.txt
@@ -35,6 +35,19 @@ Version 4.11.0
    I submitted the bug to ZiLOG), but I have permanently worked around the
    above problem for all ZiLOG compiler.
 
+Version 5.1.1
+
+  On June 22, 2011 I verified that these configurations build successfully
+  with the 5.1.1 ZDS-II version.  All that is required to used ZDS-II is
+  to modify the Make.defs file so that the correct version is used.  That
+  version should also be changed in the (optional) setenv.sh file.
+
+  The above kludge for 4.11.0 is not required.
+
+  I had to make additional changes to the ZDS path in Make.defs (and also
+  in setenv.sh) when the 32-bit ZDS-II tools are installed on my 64-bit
+  Windows 7 system.
+  
 Other Versions
   If you use any version of ZDS-II other than 4.11.0 or if you install ZDS-II
   at any location other than the default location, you will have to modify
diff --git a/include/nuttx/usb/hid.h b/include/nuttx/usb/hid.h
index 2f8b7bb6589929843f973a4a4358e7b42911ecbb..0b942db4b8c9ac6d21920b01524c9efd332b02ab 100755
--- a/include/nuttx/usb/hid.h
+++ b/include/nuttx/usb/hid.h
@@ -486,7 +486,7 @@
 #define USBHID_KBDUSE_DOWN                0x5a /* Keyboard DownArrow */
 #define USBHID_KBDUSE_UP                  0x52 /* Keyboard UpArrow */
 #define USBHID_KBDUSE_KPDNUMLOCK          0x53 /* Keypad Num Lock and Clear */
-#define USBHID_KBDUSE_KPDCLEAR            0x53 /* Keypad Num Lock and Clear */
+#define USBHID_KBDUSE_KPDNUMLOCKCLEAR     0x53 /* Keypad Num Lock and Clear */
 #define USBHID_KBDUSE_KPDDIV              0x54 /* Keypad / */
 #define USBHID_KBDUSE_KPDMUL              0x55 /* Keypad * */
 #define USBHID_KBDUSE_KPDHMINUS           0x56 /* Keypad - */
@@ -603,7 +603,7 @@
 #define USBHID_KBDUSE_KPDMEMCLEAR         0xd2 /* Keypad Memory Clear */
 #define USBHID_KBDUSE_KPDMEMADD           0xd3 /* Keypad Memory Add */
 #define USBHID_KBDUSE_KPDMEMSUB           0xd4 /* Keypad Memory Subtract */
-#define USBHID_KBDUSE_KPDMEMADD           0xd5 /* Keypad Memory Multiply */
+#define USBHID_KBDUSE_KPDMEMMULT          0xd5 /* Keypad Memory Multiply */
 #define USBHID_KBDUSE_KPDMEMDIV           0xd6 /* Keypad Memory Divide */
 #define USBHID_KBDUSE_KPDPLUSMINUS        0xd7 /* Keypad +/- */
 #define USBHID_KBDUSE_KPDCLEAR            0xd8 /* Keypad Clear */