diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index 8cfbe4f7b..b6b863363 100644
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,3 +1,10 @@
+2003-02-22  Roland Schwingel  <roland.schwingel@onevision.de>
+
+	* include/wingdi.h (AddFontMemResourceEx[AW]): Add.
+	(RemoveFontMemResourceEx[AW]): Ditto
+	* lib/gdi32.def (AddFontMemResourceEx[AW]): Add.
+	(RemoveFontMemResourceEx[AW]): Ditto.
+
 2003-02-22  Bang Jun-Young  <junyoung@netbsd.org>
 
 	* lib/ntdll.def (NT*, RTL*, ZW*): Add missing exports.
diff --git a/winsup/w32api/include/wingdi.h b/winsup/w32api/include/wingdi.h
index 69840ac2d..b4f5e52d0 100644
--- a/winsup/w32api/include/wingdi.h
+++ b/winsup/w32api/include/wingdi.h
@@ -2406,6 +2406,8 @@ BOOL WINAPI AbortPath(HDC);
 int WINAPI AddFontResourceA(LPCSTR);
 int WINAPI AddFontResourceW(LPCWSTR);
 #if (_WIN32_WINNT >= 0x0500)
+HANDLE WINAPI AddFontMemResourceExA(PVOID,DWORD,PVOID,DWORD);
+HANDLE WINAPI AddFontMemResourceExW(PVOID,DWORD,PVOID,DWORD);
 int WINAPI AddFontResourceExA(LPCSTR,DWORD,PVOID);
 int WINAPI AddFontResourceExW(LPCWSTR,DWORD,PVOID);
 #endif
@@ -2662,6 +2664,8 @@ BOOL WINAPI RectVisible(HDC,LPCRECT);
 BOOL WINAPI RemoveFontResourceA(LPCSTR);
 BOOL WINAPI RemoveFontResourceW(LPCWSTR);
 #if (_WIN32_WINNT >= 0x0500)
+BOOL WINAPI RemoveFontMemResourceExA(HANDLE);
+BOOL WINAPI RemoveFontMemResourceExW(HANDLE);
 BOOL WINAPI RemoveFontResourceExA(LPCSTR,DWORD,PVOID);
 BOOL WINAPI RemoveFontResourceExW(LPCWSTR,DWORD,PVOID);
 #endif
@@ -2780,6 +2784,7 @@ typedef ENUMLOGFONTW ENUMLOGFONT,*LPENUMLOGFONT;
 typedef ENUMLOGFONTEXW ENUMLOGFONTEX,*LPENUMLOGFONTEX;
 #define AddFontResource AddFontResourceW
 #if (_WIN32_WINNT >= 0x0500)
+#define AddFontMemResourceEx AddFontMemResourceExW
 #define AddFontResourceEx AddFontResourceExW
 #endif
 #define CopyEnhMetaFile CopyEnhMetaFileW
@@ -2820,6 +2825,7 @@ typedef ENUMLOGFONTEXW ENUMLOGFONTEX,*LPENUMLOGFONTEX;
 #define PolyTextOut PolyTextOutW
 #define RemoveFontResource RemoveFontResourceW
 #if (_WIN32_WINNT >= 0x0500)
+#define RemoveFontMemResourceEx RemoveFontMemResourceExW
 #define RemoveFontResourceEx RemoveFontResourceExW
 #endif
 #define ResetDC ResetDCW
@@ -2848,6 +2854,7 @@ typedef ENUMLOGFONTA ENUMLOGFONT,*LPENUMLOGFONT;
 typedef ENUMLOGFONTEXA ENUMLOGFONTEX,*LPENUMLOGFONTEX;
 #define AddFontResource AddFontResourceA
 #if (_WIN32_WINNT >= 0x0500)
+#define AddFontMemResourceEx AddFontMemResourceExA
 #define AddFontResourceEx AddFontResourceExA
 #endif
 #define CopyEnhMetaFile CopyEnhMetaFileA
@@ -2888,6 +2895,7 @@ typedef ENUMLOGFONTEXA ENUMLOGFONTEX,*LPENUMLOGFONTEX;
 #define PolyTextOut PolyTextOutA
 #define RemoveFontResource RemoveFontResourceA
 #if (_WIN32_WINNT >= 0x0500)
+#define RemoveFontMemResourceEx RemoveFontMemResourceExA
 #define RemoveFontResourceEx RemoveFontResourceExA
 #endif
 #define ResetDC ResetDCA
diff --git a/winsup/w32api/lib/gdi32.def b/winsup/w32api/lib/gdi32.def
index 925e19e81..679340f35 100644
--- a/winsup/w32api/lib/gdi32.def
+++ b/winsup/w32api/lib/gdi32.def
@@ -2,6 +2,8 @@ LIBRARY GDI32.dll
 EXPORTS
 AbortDoc@4
 AbortPath@4
+AddFontMemResourceExA@16
+AddFontMemResourceExW@16
 AddFontResourceA@4
 AddFontResourceW@4
 AddFontResourceExA@12
@@ -256,6 +258,8 @@ RealizePalette@4
 RectInRegion@8
 RectVisible@8
 Rectangle@20
+RemoveFontMemResourceExA@4
+RemoveFontMemResourceExW@4
 RemoveFontResourceA@4
 RemoveFontResourceW@4
 RemoveFontResourceExA@12