diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index 45b498ce0..b6ee0dfaa 100644
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,3 +1,17 @@
+2003-10-06  Dimitri Papadopoulos  <papadopo@users.sourceforge.net>
+
+	* include/winbase.h [_WIN32_WINNT >= 0x0400] (ConvertFiberToThread):
+	Add function. Sometimes I don't understand MSDN. This function is
+	available on Windows XP and Server 2003, but the SDK is supposed to
+	make it available when _WIN32_WINNT >= 0x0400, or so says the MSDN.
+	Mmmh...
+
+	* include/winbase.h [_WIN32_WINNT >= 0x0400] (CreateFiberEx):
+	Guard function. Same remark as above.
+
+	* lib/user32.def (ConvertFiberToThread, CreateFiberEx):
+	Add functions.
+
 2003-10-06  Dimitri Papadopoulos  <papadopo@users.sourceforge.net>
 
 	* include/winbase.h [_WIN32_WINNT >= 0x0501] (ACTCTX_FLAG_*):
diff --git a/winsup/w32api/include/winbase.h b/winsup/w32api/include/winbase.h
index 68f6c49ed..f32b4fa25 100644
--- a/winsup/w32api/include/winbase.h
+++ b/winsup/w32api/include/winbase.h
@@ -1054,6 +1054,9 @@ BOOL WINAPI CommConfigDialogW(LPCWSTR,HWND,LPCOMMCONFIG);
 LONG WINAPI CompareFileTime(CONST FILETIME*,CONST FILETIME*);
 BOOL WINAPI ConnectNamedPipe(HANDLE,LPOVERLAPPED);
 BOOL WINAPI ContinueDebugEvent(DWORD,DWORD,DWORD);
+#if (_WIN32_WINNT >= 0x0400)
+BOOL WINAPI ConvertFiberToThread(void);
+#endif
 PVOID WINAPI ConvertThreadToFiber(PVOID);
 BOOL WINAPI CopyFileA(LPCSTR,LPCSTR,BOOL);
 BOOL WINAPI CopyFileW(LPCWSTR,LPCWSTR,BOOL);
@@ -1075,7 +1078,9 @@ BOOL WINAPI CreateDirectoryExW(LPCWSTR,LPCWSTR,LPSECURITY_ATTRIBUTES);
 HANDLE WINAPI CreateEventA(LPSECURITY_ATTRIBUTES,BOOL,BOOL,LPCSTR);
 HANDLE WINAPI CreateEventW(LPSECURITY_ATTRIBUTES,BOOL,BOOL,LPCWSTR);
 LPVOID WINAPI CreateFiber(SIZE_T,LPFIBER_START_ROUTINE,LPVOID);
+#if (_WIN32_WINNT >= 0x0400)
 LPVOID WINAPI CreateFiberEx(SIZE_T,SIZE_T,DWORD,LPFIBER_START_ROUTINE,LPVOID);
+#endif
 HANDLE WINAPI CreateFileA(LPCSTR,DWORD,DWORD,LPSECURITY_ATTRIBUTES,DWORD,DWORD,HANDLE);
 HANDLE WINAPI CreateFileW(LPCWSTR,DWORD,DWORD,LPSECURITY_ATTRIBUTES,DWORD,DWORD,HANDLE);
 HANDLE WINAPI CreateFileMappingA(HANDLE,LPSECURITY_ATTRIBUTES,DWORD,DWORD,DWORD,LPCSTR);
diff --git a/winsup/w32api/lib/kernel32.def b/winsup/w32api/lib/kernel32.def
index 423701bf5..4539e2d25 100644
--- a/winsup/w32api/lib/kernel32.def
+++ b/winsup/w32api/lib/kernel32.def
@@ -46,6 +46,7 @@ ConnectNamedPipe@8
 ConsoleMenuControl@12
 ContinueDebugEvent@12
 ConvertDefaultLocale@4
+ConvertFiberToThread@0
 ConvertThreadToFiber@4
 ConvertToGlobalHandle@4
 CopyFileA@12
@@ -60,6 +61,7 @@ CreateDirectoryW@8
 CreateEventA@16
 CreateEventW@16
 CreateFiber@12
+CreateFiberEx@12
 CreateFileA@28
 CreateFileMappingA@24
 CreateFileMappingW@24