diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index 728a2529f..a44f805da 100644
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,3 +1,8 @@
+2003-10-13  Martin Fuchs  <Martin-Fuchs@gmx.net>
+
+	* include/shlobj.h (CFSTR_FILENAME, CFSTR_FILEDESCRIPTOR,
+	CFSTR_FILENAMEMAP, CFSTR_SHELLURL): Correct UNICODE definitions.
+
 2003-10-13  Pierre Humblet  <pierre.humblet@ieee.org>
 
 	* include/winnt.h (SM_REMOTESESSION): Add define.
diff --git a/winsup/w32api/include/shlobj.h b/winsup/w32api/include/shlobj.h
index c990c471b..b37525bc0 100644
--- a/winsup/w32api/include/shlobj.h
+++ b/winsup/w32api/include/shlobj.h
@@ -185,16 +185,23 @@ extern "C" {
 #define CFSTR_SHELLIDLIST	TEXT("Shell IDList Array")
 #define CFSTR_SHELLIDLISTOFFSET	TEXT("Shell Object Offsets")
 #define CFSTR_NETRESOURCES	TEXT("Net Resource")
-#define CFSTR_FILEDESCRIPTOR	TEXT("FileGroupDescriptor")
 #define CFSTR_FILECONTENTS	TEXT("FileContents")
-#define CFSTR_FILENAME	TEXT("FileName")
+#ifdef UNICODE
+#define CFSTR_FILENAME		L"FileNameW"
+#define CFSTR_FILENAMEMAP	L"FileNameMapW"
+#define CFSTR_FILEDESCRIPTOR	L"FileGroupDescriptorW"
+#define CFSTR_SHELLURL		L"UniformResourceLocatorW"
+#else
+#define CFSTR_FILENAME		"FileName"
+#define CFSTR_FILENAMEMAP	"FileNameMap"
+#define CFSTR_FILEDESCRIPTOR	"FileGroupDescriptor"
+#define CFSTR_SHELLURL		"UniformResourceLocator"
+#endif
 #define CFSTR_PRINTERGROUP	TEXT("PrinterFriendlyName")
-#define CFSTR_FILENAMEMAP	TEXT("FileNameMap")
 #define CFSTR_INDRAGLOOP	TEXT("InShellDragLoop")
 #define CFSTR_PASTESUCCEEDED	TEXT("Paste Succeeded")
 #define CFSTR_PERFORMEDDROPEFFECT	TEXT("Performed DropEffect")
 #define CFSTR_PREFERREDDROPEFFECT	TEXT("Preferred DropEffect")
-#define CFSTR_SHELLURL	TEXT("UniformResourceLocator")
 #define CMF_NORMAL	0
 #define CMF_DEFAULTONLY	1
 #define CMF_VERBSONLY	2