diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index 10663728f..ab192f960 100644
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,3 +1,12 @@
+2005-09-21	Chris Sutcliffe <ir0nh34d@users.sourceforge.net>
+
+	* include/winbase.h (RegisterWaitForSingleObject,
+	RegisterWaitForSingleObjectEx): Define.
+	* lib/kernel32.def (RegisterWaitForSingleObjectEx@20): Define.
+	(RegisterWaitForSingleObject@16): Changed to
+	RegisterWaitForSingleObject@24.
+	Thanks to: Brandon Sneed <nivenh at users dot sourceforge dot net>
+
 2005-09-19  Danny Smith  <dannysmith@users.sourceforge.net>
 
 	* include/winsock2.h (SO_EXCLUSIVEADDRUSE): Define.
diff --git a/winsup/w32api/include/winbase.h b/winsup/w32api/include/winbase.h
index 4875432bc..f05b61ee2 100644
--- a/winsup/w32api/include/winbase.h
+++ b/winsup/w32api/include/winbase.h
@@ -1758,6 +1758,10 @@ WINBASEAPI BOOL WINAPI ReadFileScatter(HANDLE,FILE_SEGMENT_ELEMENT*,DWORD,LPDWOR
 WINBASEAPI BOOL WINAPI ReadProcessMemory(HANDLE,PCVOID,PVOID,DWORD,PDWORD);
 WINBASEAPI HANDLE WINAPI RegisterEventSourceA (LPCSTR,LPCSTR);
 WINBASEAPI HANDLE WINAPI RegisterEventSourceW(LPCWSTR,LPCWSTR);
+#if (_WIN32_WINNT >= 0x0500)
+WINBASEAPI BOOL WINAPI RegisterWaitForSingleObject(PHANDLE,HANDLE,WAITORTIMERCALLBACK,PVOID,ULONG,ULONG);
+WINBASEAPI HANDLE WINAPI RegisterWaitForSingleObjectEx(HANDLE,WAITORTIMERCALLBACK,PVOID,ULONG,ULONG);
+#endif
 #if (_WIN32_WINNT >= 0x0501)
 WINBASEAPI void WINAPI ReleaseActCtx(HANDLE);
 #endif
diff --git a/winsup/w32api/lib/kernel32.def b/winsup/w32api/lib/kernel32.def
index 08b628699..6ef6528e1 100644
--- a/winsup/w32api/lib/kernel32.def
+++ b/winsup/w32api/lib/kernel32.def
@@ -621,7 +621,8 @@ ReadProcessMemory@20
 ReadProcessMemoryVlm@20
 RegisterConsoleVDM@44
 RegisterWaitForInputIdle@4
-RegisterWaitForSingleObject@16
+RegisterWaitForSingleObject@24
+RegisterWaitForSingleObjectEx@20
 RegisterWowBaseHandlers@4
 RegisterWowExec@4
 ReleaseActCtx@4