diff --git a/ChangeLog b/ChangeLog
index 2d72adac9..77b93eb38 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2005-12-13  Mike Kestner  <mkestner@novell.com>
+
+	* sources/Makefile.am : move to stable gtk 2.8 versions.
+	* sources/gtk-sharp-2.8-sources.xml : move to stable gtk 2.8 versions.
+	* */*.raw : regenerate.
+	* gdk/Gdk.metadata : hide a few gtk+ internal methods.
+	* gtk/Gtk.metadata : hide a win32 internal enum.
+
 2005-12-13  Mike Kestner  <mkestner@novell.com>
 
 	* bootstrap-2.8 : bump version to 2.7.90.
diff --git a/atk/atk-api-2.8.raw b/atk/atk-api-2.8.raw
index e8751ece3..7e4e40aaf 100644
--- a/atk/atk-api-2.8.raw
+++ b/atk/atk-api-2.8.raw
@@ -159,6 +159,7 @@
       <member cname="ATK_STATE_MANAGES_DESCENDANTS" name="ManagesDescendants" />
       <member cname="ATK_STATE_INDETERMINATE" name="Indeterminate" />
       <member cname="ATK_STATE_TRUNCATED" name="Truncated" />
+      <member cname="ATK_STATE_REQUIRED" name="Required" />
       <member cname="ATK_STATE_LAST_DEFINED" name="LastDefined" />
     </enum>
     <enum name="TextAttribute" cname="AtkTextAttribute" gtype="atk_text_attribute_get_type" type="enum">
diff --git a/doc/en/Atk/StateType.xml b/doc/en/Atk/StateType.xml
index 739dee8d0..73c380283 100644
--- a/doc/en/Atk/StateType.xml
+++ b/doc/en/Atk/StateType.xml
@@ -433,8 +433,7 @@
       <Parameters>
       </Parameters>
       <Docs>
-        <summary>To be added</summary>
-        <remarks>To be added</remarks>
+        <summary>Indicates that a check box is in a state other than checked or not checked.</summary>
         <since version="Gtk# 2.4" />
       </Docs>
     </Member>
@@ -447,10 +446,20 @@
       <Parameters>
       </Parameters>
       <Docs>
-        <summary>To be added</summary>
-        <remarks>To be added</remarks>
+        <summary>Indicates that an object is truncated, e.g. a text value in a speradsheet cell.</summary>
         <since version="Gtk# 2.6" />
       </Docs>
     </Member>
+    <Member MemberName="Required">
+      <MemberSignature Language="C#" Value="Required" />
+      <MemberType>Field</MemberType>
+      <ReturnValue>
+        <ReturnType>Atk.StateType</ReturnType>
+      </ReturnValue>
+      <Docs>
+        <summary>Indicates that explicit user interaction with an object is required by the user interface, e.g. a required field in a "web-form" interface.</summary>
+        <since version="Gtk# 2.8" />
+      </Docs>
+    </Member>
   </Members>
 </Type>
diff --git a/doc/en/Pango/Script.xml b/doc/en/Pango/Script.xml
index 0f4a41560..f0ffcaef3 100644
--- a/doc/en/Pango/Script.xml
+++ b/doc/en/Pango/Script.xml
@@ -787,5 +787,82 @@
         </remarks>
       </Docs>
     </Member>
+    <Member MemberName="Kharoshthi">
+      <MemberSignature Language="C#" Value="Kharoshthi" />
+      <MemberType>Field</MemberType>
+      <ReturnValue>
+        <ReturnType>Pango.Script</ReturnType>
+      </ReturnValue>
+      <Docs>
+        <summary>Kharoshthi</summary>
+	<since version="Gtk# 2.8" />
+      </Docs>
+    </Member>
+    <Member MemberName="NewTaiLue">
+      <MemberSignature Language="C#" Value="NewTaiLue" />
+      <MemberType>Field</MemberType>
+      <ReturnValue>
+        <ReturnType>Pango.Script</ReturnType>
+      </ReturnValue>
+      <Docs>
+        <summary>NewTaiLue</summary>
+	<since version="Gtk# 2.8" />
+      </Docs>
+    </Member>
+    <Member MemberName="Tifinagh">
+      <MemberSignature Language="C#" Value="Tifinagh" />
+      <MemberType>Field</MemberType>
+      <ReturnValue>
+        <ReturnType>Pango.Script</ReturnType>
+      </ReturnValue>
+      <Docs>
+        <summary>Tifinagh</summary>
+	<since version="Gtk# 2.8" />
+      </Docs>
+    </Member>
+    <Member MemberName="Buginese">
+      <MemberSignature Language="C#" Value="Buginese" />
+      <MemberType>Field</MemberType>
+      <ReturnValue>
+        <ReturnType>Pango.Script</ReturnType>
+      </ReturnValue>
+      <Docs>
+        <summary>Buginese</summary>
+	<since version="Gtk# 2.8" />
+      </Docs>
+    </Member>
+    <Member MemberName="Glagolitic">
+      <MemberSignature Language="C#" Value="Glagolitic" />
+      <MemberType>Field</MemberType>
+      <ReturnValue>
+        <ReturnType>Pango.Script</ReturnType>
+      </ReturnValue>
+      <Docs>
+        <summary>Glagolitic</summary>
+	<since version="Gtk# 2.8" />
+      </Docs>
+    </Member>
+    <Member MemberName="OldPersian">
+      <MemberSignature Language="C#" Value="OldPersian" />
+      <MemberType>Field</MemberType>
+      <ReturnValue>
+        <ReturnType>Pango.Script</ReturnType>
+      </ReturnValue>
+      <Docs>
+        <summary>OldPersian</summary>
+	<since version="Gtk# 2.8" />
+      </Docs>
+    </Member>
+    <Member MemberName="SylotiNagri">
+      <MemberSignature Language="C#" Value="SylotiNagri" />
+      <MemberType>Field</MemberType>
+      <ReturnValue>
+        <ReturnType>Pango.Script</ReturnType>
+      </ReturnValue>
+      <Docs>
+        <summary>SylotiNagri</summary>
+	<since version="Gtk# 2.8" />
+      </Docs>
+    </Member>
   </Members>
 </Type>
diff --git a/gdk/Gdk.metadata b/gdk/Gdk.metadata
index de6aa4247..b18f7f4a0 100644
--- a/gdk/Gdk.metadata
+++ b/gdk/Gdk.metadata
@@ -123,11 +123,15 @@
   <attr path="/api/namespace/object[@cname='GdkPixmap']/method[@name='ColormapCreateFromXpm']/*/*[@name='mask']" name="pass_as">out</attr>
   <attr path="/api/namespace/object[@cname='GdkPixmap']/method[@name='ColormapCreateFromXpmD']/*/*[@name='mask']" name="pass_as">out</attr>
   <attr path="/api/namespace/object[@cname='GdkPixmap']/method[@name='ColormapCreateFromXpmD']/*/*[@name='data']" name="array">1</attr>
+  <attr path="/api/namespace/object[@cname='GdkScreen']/method[@name='GetFontOptionsLibgtkOnly']" name="hidden">1</attr>
   <attr path="/api/namespace/object[@cname='GdkScreen']/method[@name='GetMonitorGeometry']/*/*[@type='GdkRectangle*']" name="pass_as">out</attr>
+  <attr path="/api/namespace/object[@cname='GdkScreen']/method[@name='GetResolutionLibgtkOnly']" name="hidden">1</attr>
   <attr path="/api/namespace/object[@cname='GdkScreen']/method[@name='GetToplevelWindows']" name="hidden">1</attr>
   <attr path="/api/namespace/object[@cname='GdkScreen']/method[@name='Height']" name="hidden">1</attr>
   <attr path="/api/namespace/object[@cname='GdkScreen']/method[@name='HeightMm']" name="hidden">1</attr>
   <attr path="/api/namespace/object[@cname='GdkScreen']/method[@name='ListVisuals']" name="hidden">1</attr>
+  <attr path="/api/namespace/object[@cname='GdkScreen']/method[@name='SetFontOptionsLibgtkOnly']" name="hidden">1</attr>
+  <attr path="/api/namespace/object[@cname='GdkScreen']/method[@name='SetResolutionLibgtkOnly']" name="hidden">1</attr>
   <attr path="/api/namespace/object[@cname='GdkScreen']/method[@name='Width']" name="hidden">1</attr>
   <attr path="/api/namespace/object[@cname='GdkScreen']/method[@name='WidthMm']" name="hidden">1</attr>
   <attr path="/api/namespace/object[@cname='GdkWindow']" name="parent">GdkDrawable</attr>
diff --git a/gdk/gdk-api-2.8.raw b/gdk/gdk-api-2.8.raw
index 836fb8f57..e7e0e66f4 100644
--- a/gdk/gdk-api-2.8.raw
+++ b/gdk/gdk-api-2.8.raw
@@ -2029,6 +2029,8 @@
       <field name="Closed" cname="closed" bits="1" type="guint" />
       <field name="NormalGcs" cname="normal_gcs" array_len="32" type="GdkGC*" />
       <field name="ExposureGcs" cname="exposure_gcs" array_len="32" type="GdkGC*" />
+      <field name="FontOptions" cname="font_options" type="cairo_font_options_t*" />
+      <field name="Resolution" cname="resolution" type="double" />
       <signal name="SizeChanged" cname="size_changed" when="LAST">
         <return-type type="void" />
         <parameters>
@@ -2050,6 +2052,9 @@
       <method name="GetDisplay" cname="gdk_screen_get_display">
         <return-type type="GdkDisplay*" />
       </method>
+      <method name="GetFontOptionsLibgtkOnly" cname="gdk_screen_get_font_options_libgtk_only">
+        <return-type type="const-cairo_font_options_t*" />
+      </method>
       <method name="GetHeight" cname="gdk_screen_get_height">
         <return-type type="gint" />
       </method>
@@ -2082,6 +2087,9 @@
       <method name="GetNumber" cname="gdk_screen_get_number">
         <return-type type="gint" />
       </method>
+      <method name="GetResolutionLibgtkOnly" cname="gdk_screen_get_resolution_libgtk_only">
+        <return-type type="gdouble" />
+      </method>
       <method name="GetRgbColormap" cname="gdk_screen_get_rgb_colormap">
         <return-type type="GdkColormap*" />
       </method>
@@ -2140,6 +2148,18 @@
           <parameter type="GdkColormap*" name="colormap" />
         </parameters>
       </method>
+      <method name="SetFontOptionsLibgtkOnly" cname="gdk_screen_set_font_options_libgtk_only">
+        <return-type type="void" />
+        <parameters>
+          <parameter type="const-cairo_font_options_t*" name="options" />
+        </parameters>
+      </method>
+      <method name="SetResolutionLibgtkOnly" cname="gdk_screen_set_resolution_libgtk_only">
+        <return-type type="void" />
+        <parameters>
+          <parameter type="gdouble" name="dpi" />
+        </parameters>
+      </method>
       <method name="Width" cname="gdk_screen_width" shared="true">
         <return-type type="gint" />
       </method>
@@ -3481,6 +3501,7 @@
       <field name="Destroyed" cname="destroyed" bits="2" type="guint" />
       <field name="AcceptFocus" cname="accept_focus" bits="1" type="guint" />
       <field name="FocusOnMap" cname="focus_on_map" bits="1" type="guint" />
+      <field name="Shaped" cname="shaped" bits="1" type="guint" />
       <field name="EventMask" cname="event_mask" type="GdkEventMask" />
       <method name="GetType" cname="gdk_window_object_get_type" shared="true">
         <return-type type="GType" />
diff --git a/gtk/Gtk.metadata b/gtk/Gtk.metadata
index fdf229b9c..2dcaae8bb 100644
--- a/gtk/Gtk.metadata
+++ b/gtk/Gtk.metadata
@@ -111,6 +111,7 @@
   <attr path="/api/namespace/enum[@cname='GtkSignalRunType']" name="hidden">1</attr>
   <attr path="/api/namespace/enum[@cname='GtkToolbarSpaceStyle']" name="hidden">1</attr>
   <attr path="/api/namespace/enum[@cname='GtkVisibility']" name="hidden">1</attr>
+  <attr path="/api/namespace/enum[@cname='GtkWin32EmbedMessageType']" name="hidden">1</attr>
   <attr path="/api/namespace/interface[@cname='GtkCellEditable']/method[@name='EditingDone']" name="name">FinishEditing</attr>
   <attr path="/api/namespace/interface[@cname='GtkCellEditable']/signal[@name='RemoveWidget']" name="name">WidgetRemoved</attr>
   <attr path="/api/namespace/interface[@cname='GtkCellLayout']/method[@name='SetAttributes']" name="hidden">1</attr> 
diff --git a/gtk/gtk-api-2.8.raw b/gtk/gtk-api-2.8.raw
index 27251205d..23e74918e 100644
--- a/gtk/gtk-api-2.8.raw
+++ b/gtk/gtk-api-2.8.raw
@@ -575,6 +575,23 @@
       <member cname="GTK_WIDGET_HELP_TOOLTIP" name="Tooltip" />
       <member cname="GTK_WIDGET_HELP_WHATS_THIS" name="WhatsThis" />
     </enum>
+    <enum name="Win32EmbedMessageType" cname="GtkWin32EmbedMessageType" type="enum">
+      <member cname="GTK_WIN32_EMBED_WINDOW_ACTIVATE" name="WindowActivate" />
+      <member cname="GTK_WIN32_EMBED_WINDOW_DEACTIVATE" name="WindowDeactivate" />
+      <member cname="GTK_WIN32_EMBED_FOCUS_IN" name="FocusIn" />
+      <member cname="GTK_WIN32_EMBED_FOCUS_OUT" name="FocusOut" />
+      <member cname="GTK_WIN32_EMBED_MODALITY_ON" name="ModalityOn" />
+      <member cname="GTK_WIN32_EMBED_MODALITY_OFF" name="ModalityOff" />
+      <member cname="GTK_WIN32_EMBED_PARENT_NOTIFY" name="ParentNotify" />
+      <member cname="GTK_WIN32_EMBED_EVENT_PLUG_MAPPED" name="EventPlugMapped" />
+      <member cname="GTK_WIN32_EMBED_PLUG_RESIZED" name="PlugResized" />
+      <member cname="GTK_WIN32_EMBED_REQUEST_FOCUS" name="RequestFocus" />
+      <member cname="GTK_WIN32_EMBED_FOCUS_NEXT" name="FocusNext" />
+      <member cname="GTK_WIN32_EMBED_FOCUS_PREV" name="FocusPrev" />
+      <member cname="GTK_WIN32_EMBED_GRAB_KEY" name="GrabKey" />
+      <member cname="GTK_WIN32_EMBED_UNGRAB_KEY" name="UngrabKey" />
+      <member cname="GTK_WIN32_EMBED_LAST" name="Last" />
+    </enum>
     <enum name="WindowPosition" cname="GtkWindowPosition" gtype="gtk_window_position_get_type" type="enum">
       <member cname="GTK_WIN_POS_NONE" name="None" />
       <member cname="GTK_WIN_POS_CENTER" name="Center" />
@@ -12195,8 +12212,8 @@
       <field name="Tooltips" cname="tooltips" type="GtkTooltips*" access="public" />
       <field name="ButtonMaxw" cname="button_maxw" type="gint" />
       <field name="ButtonMaxh" cname="button_maxh" type="gint" />
-      <field name="StyleSetConnection" cname="style_set_connection" type="guint" />
-      <field name="IconSizeConnection" cname="icon_size_connection" type="guint" />
+      <field name="GtkReserved1" cname="_gtk_reserved1" type="guint" />
+      <field name="GtkReserved2" cname="_gtk_reserved2" type="guint" />
       <field name="StyleSet" cname="style_set" bits="1" type="guint" />
       <field name="IconSizeSet" cname="icon_size_set" bits="1" type="guint" />
       <signal name="OrientationChanged" cname="orientation-changed" when="FIRST">
@@ -16769,7 +16786,7 @@
       </method>
       <constructor cname="gtk_text_attributes_new" />
       <method name="Ref" cname="gtk_text_attributes_ref">
-        <return-type type="void" />
+        <return-type type="GtkTextAttributes*" />
       </method>
       <method name="Unref" cname="gtk_text_attributes_unref">
         <return-type type="void" />
diff --git a/pango/pango-api-2.8.raw b/pango/pango-api-2.8.raw
index edf291bcf..f9cf85ff8 100644
--- a/pango/pango-api-2.8.raw
+++ b/pango/pango-api-2.8.raw
@@ -126,6 +126,13 @@
       <member cname="PANGO_SCRIPT_LINEAR_B" name="LinearB" />
       <member cname="PANGO_SCRIPT_TAI_LE" name="TaiLe" />
       <member cname="PANGO_SCRIPT_UGARITIC" name="Ugaritic" />
+      <member cname="PANGO_SCRIPT_NEW_TAI_LUE" name="NewTaiLue" />
+      <member cname="PANGO_SCRIPT_BUGINESE" name="Buginese" />
+      <member cname="PANGO_SCRIPT_GLAGOLITIC" name="Glagolitic" />
+      <member cname="PANGO_SCRIPT_TIFINAGH" name="Tifinagh" />
+      <member cname="PANGO_SCRIPT_SYLOTI_NAGRI" name="SylotiNagri" />
+      <member cname="PANGO_SCRIPT_OLD_PERSIAN" name="OldPersian" />
+      <member cname="PANGO_SCRIPT_KHAROSHTHI" name="Kharoshthi" />
     </enum>
     <enum name="Stretch" cname="PangoStretch" gtype="pango_stretch_get_type" type="enum">
       <member cname="PANGO_STRETCH_ULTRA_CONDENSED" name="UltraCondensed" />
diff --git a/sources/Makefile.am b/sources/Makefile.am
index 495774c99..068330996 100644
--- a/sources/Makefile.am
+++ b/sources/Makefile.am
@@ -33,9 +33,9 @@ GTK_2_6_DOWNLOADS = \
 	http://ftp.gnome.org/pub/GNOME/desktop/2.10/2.10.0/sources/gnome-panel-2.10.0.tar.bz2
 
 GTK_2_8_DOWNLOADS = \
-	ftp://ftp.gtk.org/pub/gtk/v2.7/pango-1.9.1.tar.bz2                                      	\
-	ftp://ftp.gtk.org/pub/gtk/v2.6/atk-1.9.0.tar.bz2                                        	\
-	ftp://ftp.gtk.org/pub/gtk/v2.7/gtk+-2.7.4.tar.bz2						\
+	ftp://ftp.gtk.org/pub/gtk/v2.8/pango-1.10.2.tar.bz2                                      	\
+	ftp://ftp.gtk.org/pub/gtk/v2.8/atk-1.10.3.tar.bz2                                        	\
+	ftp://ftp.gtk.org/pub/gtk/v2.8/gtk+-2.8.9.tar.bz2						\
 	http://ftp.gnome.org/pub/GNOME/platform/2.10/2.10.0/sources/gnome-vfs-2.10.0.tar.bz2		\
 	http://ftp.gnome.org/pub/GNOME/platform/2.10/2.10.0/sources/libgnome-2.10.0.tar.bz2       	\
 	http://ftp.gnome.org/pub/GNOME/platform/2.10/2.10.0/sources/libgnomecanvas-2.10.0.tar.bz2 	\
@@ -96,9 +96,9 @@ get-2.8-sources:
 	for i in $(GTK_2_8_DOWNLOADS); do                  \
 		wget $$i --output-document=- | tar -xj ;   \
 	done;
-	ln -f -s gtkfilechooserprivate.h gtk+-2.7.4/gtk/gtkfilechooserpriv.h
-	patch -p0 gtk+-2.7.4/gtk/gtktreemodel.c < gtk_tree_model_signal_fix.patch
-	patch -p0 gtk+-2.7.4/gtk/gtkclipboard.h < gtkclipboard.patch
+	ln -f -s gtkfilechooserprivate.h gtk+-2.8.9/gtk/gtkfilechooserpriv.h
+	patch -p0 gtk+-2.8.9/gtk/gtktreemodel.c < gtk_tree_model_signal_fix.patch
+	patch -p0 gtk+-2.8.9/gtk/gtkclipboard.h < gtkclipboard.patch
 
 get-gnome-sources:
 	for i in $(GNOME_DOWNLOADS); do                    \
diff --git a/sources/gtk-sharp-2.8-sources.xml b/sources/gtk-sharp-2.8-sources.xml
index e4fd3fab9..bebfb5251 100644
--- a/sources/gtk-sharp-2.8-sources.xml
+++ b/sources/gtk-sharp-2.8-sources.xml
@@ -2,14 +2,14 @@
   <api filename="../atk/atk-api-2.8.raw">
     <library name="libatk-1.0-0.dll">
       <namespace name="Atk">
-        <dir>atk-1.9.0/atk</dir>
+        <dir>atk-1.10.3/atk</dir>
       </namespace>
     </library>
   </api>
   <api filename="../pango/pango-api-2.8.raw">
     <library name="libpango-1.0-0.dll">
       <namespace name="Pango">
-        <directory path="pango-1.9.1/pango">
+        <directory path="pango-1.10.2/pango">
 	  <exclude>pangocairo.h</exclude>
 	  <exclude>pangocairo-fc.h</exclude>
 	  <exclude>pangocairo-win32.h</exclude>
@@ -44,7 +44,7 @@
   <api filename="../gdk/gdk-api-2.8.raw">
     <library name="libgdk-win32-2.0-0.dll">
       <namespace name="Gdk">
-        <directory path="gtk+-2.7.4/gdk">
+        <directory path="gtk+-2.8.9/gdk">
           <exclude>gdkalias.h</exclude>
           <exclude>keyname-table.h</exclude>
         </directory>
@@ -52,7 +52,7 @@
     </library>
     <library name="libgdk_pixbuf-2.0-0.dll">
       <namespace name="Gdk">
-        <directory path="gtk+-2.7.4/gdk-pixbuf">
+        <directory path="gtk+-2.8.9/gdk-pixbuf">
           <exclude>gdk-pixbuf-alias.h</exclude>
           <exclude>xpm-color-table.h</exclude>
         </directory>
@@ -62,7 +62,7 @@
   <api filename="../gtk/gtk-api-2.8.raw">
     <library name="libgtk-win32-2.0-0.dll">
       <namespace name="Gtk">
-        <directory path="gtk+-2.7.4/gtk">
+        <directory path="gtk+-2.8.9/gtk">
           <!-- Internal stuff -->
           <exclude>gtkalias.h</exclude>
           <exclude>gtkdndcursors.h</exclude>