diff --git a/ChangeLog b/ChangeLog
index cd17bd0940..5403c10b90 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-07-26  Tor Lillqvist  <tml@novell.com>
+
+	* gtk/gtkplug-win32.c: Declare GetAncestor() and define GA_PARENT
+	if missing (MSVC6). (#311633)
+
 2005-07-26  Federico Mena Quintero  <federico@ximian.com>
 
 	* perf/: New directory with the start of a framework for testing
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index cd17bd0940..5403c10b90 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2005-07-26  Tor Lillqvist  <tml@novell.com>
+
+	* gtk/gtkplug-win32.c: Declare GetAncestor() and define GA_PARENT
+	if missing (MSVC6). (#311633)
+
 2005-07-26  Federico Mena Quintero  <federico@ximian.com>
 
 	* perf/: New directory with the start of a framework for testing
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index cd17bd0940..5403c10b90 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2005-07-26  Tor Lillqvist  <tml@novell.com>
+
+	* gtk/gtkplug-win32.c: Declare GetAncestor() and define GA_PARENT
+	if missing (MSVC6). (#311633)
+
 2005-07-26  Federico Mena Quintero  <federico@ximian.com>
 
 	* perf/: New directory with the start of a framework for testing
diff --git a/gtk/gtkplug-win32.c b/gtk/gtkplug-win32.c
index 329a7d8b76..bcbc5093a5 100644
--- a/gtk/gtkplug-win32.c
+++ b/gtk/gtkplug-win32.c
@@ -34,6 +34,13 @@
 
 #include "gtkwin32embed.h"
 
+#if defined(_MSC_VER) && (WINVER < 0x0500)
+#ifndef GA_PARENT
+#define GA_PARENT 1
+#endif
+WINUSERAPI HWND WINAPI GetAncestor(HWND,UINT);
+#endif
+
 GdkNativeWindow
 _gtk_plug_windowing_get_id (GtkPlug *plug)
 {