diff --git a/Contrib/nsDialogs/nsDialogs.nsh b/Contrib/nsDialogs/nsDialogs.nsh
index 642364fb..5fd84c4d 100644
--- a/Contrib/nsDialogs/nsDialogs.nsh
+++ b/Contrib/nsDialogs/nsDialogs.nsh
@@ -645,16 +645,12 @@ SendMessage ${CONTROL} ${CB_INSERTSTRING} -1 `STR:${STRING}`
 
 
 !define NSD_CB_GetItemData `!insertmacro __NSD_CB_GetItemData `
-!macro NSD_CB_GetItemData CONTROL INDEX VAR
+!macro __NSD_CB_GetItemData CONTROL INDEX VAR
 SendMessage ${CONTROL} ${CB_GETITEMDATA} ${INDEX} 0 ${VAR}
 !macroend
+!define NSD_CB_SetItemData `${__NSD_MkCtlCmd_WPLP} CB_SETITEMDATA ` ; Index Data
 
 
-!define NSD_CB_SetItemData `!insertmacro __NSD_CB_SetItemData `
-!macro NSD_CB_SetItemData CONTROL INDEX DATA
-SendMessage ${CONTROL} ${CB_SETITEMDATA} ${INDEX} ${DATA}
-!macroend
-
 !define NSD_CB_DelItem `${__NSD_MkCtlCmd_WP} CB_DELETESTRING 0 `
 !define NSD_CB_LimitText `${__NSD_MkCtlCmd_WP} CB_LIMITTEXT 0 `
 !define /IfNDef NSD_CB_Clear `${__NSD_MkCtlCmd} CB_RESETCONTENT 0 0 `
@@ -749,15 +745,10 @@ SendMessage ${CONTROL} ${LB_INSERTSTRING} -1 `STR:${STRING}`
 
 
 !define NSD_LB_GetItemData `!insertmacro __NSD_LB_GetItemData `
-!macro NSD_LB_GetItemData CONTROL INDEX VAR
+!macro __NSD_LB_GetItemData CONTROL INDEX VAR
 SendMessage ${CONTROL} ${LB_GETITEMDATA} ${INDEX} 0 ${VAR}
 !macroend
-
-
-!define NSD_LB_SetItemData `!insertmacro __NSD_LB_SetItemData `
-!macro NSD_LB_SetItemData CONTROL INDEX DATA
-SendMessage ${CONTROL} ${LB_SETITEMDATA} ${INDEX} ${DATA}
-!macroend
+!define NSD_LB_SetItemData `${__NSD_MkCtlCmd_WPLP} LB_SETITEMDATA ` ; Index Data
 
 
 !define NSD_LB_FindStringPrefix `!insertmacro __NSD_LB_FindStringPrefix `
diff --git a/Docs/src/history.but b/Docs/src/history.but
index 150f0013..31062b2b 100644
--- a/Docs/src/history.but
+++ b/Docs/src/history.but
@@ -40,6 +40,9 @@ ANSI targets are deprecated, consider moving to Unicode.
 
 \b Automatically doubles ampersands in the name attribute
 
+\b Fixed nsDialogs CB/LB_Get/SetItemData macros (\W{http://sf.net/p/nsis/bugs/1238}{bug #1238})
+
+
 \S2{} Translations
 
 \b Updated Hindi (\W{http://sf.net/p/nsis/patches/291}{patch #291}) and Portuguese (\W{http://sf.net/p/nsis/bugs/1219}{bug #1219})