diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index 51e5b6c49..ba18fd3b8 100644
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,3 +1,9 @@
+2004-12-23  Danny Smith  <dannysmith@users.sourceforge.net>
+
+	* include/commctrl.h (CDRF_NOTIFYSUBITEMDRAW): Add define.
+	Thanks to: Chris Sutcliffe  <ironhead@walled.net>
+	(CDRF_*): Use hex notation for constants.
+
 2004-12-08  Danny Smith  <dannysmith@users.sourceforge.net>
 
 	* include/sqlext.h (SQL_INTERVAL_*): Correct macros.
diff --git a/winsup/w32api/include/commctrl.h b/winsup/w32api/include/commctrl.h
index 980fab973..524f59f1b 100644
--- a/winsup/w32api/include/commctrl.h
+++ b/winsup/w32api/include/commctrl.h
@@ -945,14 +945,14 @@ extern "C" {
 #if (_WIN32_IE >= 0x0400)
 #define CDDS_SUBITEM 0x20000
 #endif
-/* FIXME: missing CDRF_NOTIFYSUBITEMDRAW */
-#define CDRF_DODEFAULT 0
-#define CDRF_NOTIFYITEMDRAW 32
-#define CDRF_NOTIFYITEMERASE 128
-#define CDRF_NOTIFYPOSTERASE 64
-#define CDRF_NOTIFYPOSTPAINT 16
-#define CDRF_NEWFONT 2
-#define CDRF_SKIPDEFAULT 4
+#define CDRF_DODEFAULT 0x00
+#define CDRF_NOTIFYITEMDRAW 0x20
+#define CDRF_NOTIFYSUBITEMDRAW 0x20
+#define CDRF_NOTIFYITEMERASE 0x80
+#define CDRF_NOTIFYPOSTERASE 0x40
+#define CDRF_NOTIFYPOSTPAINT 0x10
+#define CDRF_NEWFONT 0x02
+#define CDRF_SKIPDEFAULT 0x04
 #if (_WIN32_IE >= 0x0400)
 #define LVBKIF_SOURCE_NONE      0x00000000
 #define LVBKIF_SOURCE_HBITMAP   0x00000001