diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index 16c1632ff..0acae66ba 100644
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,3 +1,7 @@
+2008-08-30 Bo Yang <techrazy@users.sourceforge.net>
+
+	* include/sspi.h: Fix PSecurityFunctionTableW structure.
+
 2008-08-29  Andy Grover  <andy.grover@oracle.com>
 
 	* include/ddk/scsi.h: Define READ_TOC formats.
diff --git a/winsup/w32api/include/sspi.h b/winsup/w32api/include/sspi.h
index 1259355f8..408331692 100644
--- a/winsup/w32api/include/sspi.h
+++ b/winsup/w32api/include/sspi.h
@@ -178,6 +178,7 @@ typedef SECURITY_STATUS (WINAPI *MAKE_SIGNATURE_FN)(PCtxtHandle,ULONG,PSecBuffer
 typedef SECURITY_STATUS (WINAPI *VERIFY_SIGNATURE_FN)(PCtxtHandle,PSecBufferDesc,ULONG,PULONG);
 typedef SECURITY_STATUS (WINAPI *FREE_CONTEXT_BUFFER_FN)(PVOID);
 typedef SECURITY_STATUS (WINAPI *QUERY_SECURITY_PACKAGE_INFO_FN_A)(SEC_CHAR*,PSecPkgInfoA*);
+typedef SECURITY_STATUS (WINAPI *QUERY_SECURITY_CONTEXT_TOKEN_FN)(PCtxtHandle,HANDLE*);
 typedef SECURITY_STATUS (WINAPI *QUERY_SECURITY_PACKAGE_INFO_FN_W)(SEC_WCHAR*,PSecPkgInfoW*);
 typedef SECURITY_STATUS (WINAPI *ENCRYPT_MESSAGE_FN)(PCtxtHandle,ULONG,PSecBufferDesc,ULONG);
 typedef SECURITY_STATUS (WINAPI *DECRYPT_MESSAGE_FN)(PCtxtHandle,PSecBufferDesc,ULONG,PULONG);
@@ -192,7 +193,7 @@ typedef struct _SECURITY_FUNCTION_TABLEW {
 	ACQUIRE_CREDENTIALS_HANDLE_FN_W AcquireCredentialsHandleW;
 	FREE_CREDENTIALS_HANDLE_FN FreeCredentialsHandle;
 	void SEC_FAR* Reserved2;
-	INITIALIZE_SECURITY_CONTEXT_FN_A InitializeSecurityContextA;
+	INITIALIZE_SECURITY_CONTEXT_FN_W InitializeSecurityContextW;
 	ACCEPT_SECURITY_CONTEXT_FN AcceptSecurityContext;
 	COMPLETE_AUTH_TOKEN_FN CompleteAuthToken;
 	DELETE_SECURITY_CONTEXT_FN DeleteSecurityContext;
@@ -203,14 +204,14 @@ typedef struct _SECURITY_FUNCTION_TABLEW {
 	MAKE_SIGNATURE_FN MakeSignature;
 	VERIFY_SIGNATURE_FN VerifySignature;
 	FREE_CONTEXT_BUFFER_FN FreeContextBuffer;
-	QUERY_SECURITY_PACKAGE_INFO_FN_A QuerySecurityPackageInfoA;
+	QUERY_SECURITY_PACKAGE_INFO_FN_W QuerySecurityPackageInfoW;
 	void SEC_FAR* Reserved3;
 	void SEC_FAR* Reserved4;
-        void SEC_FAR* Unknown1;
-        void SEC_FAR* Unknown2;
-        void SEC_FAR* Unknown3;
-        void SEC_FAR* Unknown4;
-        void SEC_FAR* Unknown5;
+        void SEC_FAR* Reserved5;
+        void SEC_FAR* Reserved6;
+        void SEC_FAR* Reserved7;
+        void SEC_FAR* Reserved8;
+        QUERY_SECURITY_CONTEXT_TOKEN_FN QuerySecurityContextToken;
         ENCRYPT_MESSAGE_FN EncryptMessage;
         DECRYPT_MESSAGE_FN DecryptMessage;
 } SecurityFunctionTableW, *PSecurityFunctionTableW;