diff --git a/ChangeLog b/ChangeLog
index e21bc3619..7c7f0ac10 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2005-08-11  Dan Winship  <danw@novell.com>
+
+	* generator/OpaqueGen.cs (Generate):
+	* generator/StructBase.cs (Generate): Add the [Obsolete] attribute
+	to deprecated structs/boxeds/opaques too. (Affects Gdk.Font,
+	Gtk.Arg, Gtk.ItemFactoryEntry, Gnome.IconData, and [in 2.6]
+	Gnome.Vfs.MimeAction)
+
 2005-08-09  Dan Winship  <danw@novell.com>
 
 	* configure.in.in: kill off all gda/gnomedb references.
diff --git a/doc/en/Gdk/Font.xml b/doc/en/Gdk/Font.xml
index 2294230c3..af2307b80 100644
--- a/doc/en/Gdk/Font.xml
+++ b/doc/en/Gdk/Font.xml
@@ -283,4 +283,9 @@
       </Docs>
     </Member>
   </Members>
+  <Attributes>
+    <Attribute>
+      <AttributeName>System.Obsolete(Message=null, IsError=False)</AttributeName>
+    </Attribute>
+  </Attributes>
 </Type>
diff --git a/doc/en/Gnome.Vfs/MimeAction.xml b/doc/en/Gnome.Vfs/MimeAction.xml
index 37ed4710e..3245ef98f 100644
--- a/doc/en/Gnome.Vfs/MimeAction.xml
+++ b/doc/en/Gnome.Vfs/MimeAction.xml
@@ -105,4 +105,9 @@
     </Member>
     
   </Members>
+  <Attributes>
+    <Attribute>
+      <AttributeName>System.Obsolete(Message=null, IsError=False)</AttributeName>
+    </Attribute>
+  </Attributes>
 </Type>
diff --git a/doc/en/Gnome/IconData.xml b/doc/en/Gnome/IconData.xml
index 46c8270b4..556f047d8 100644
--- a/doc/en/Gnome/IconData.xml
+++ b/doc/en/Gnome/IconData.xml
@@ -175,4 +175,9 @@
       </Docs>
     </Member>
   </Members>
+  <Attributes>
+    <Attribute>
+      <AttributeName>System.Obsolete(Message=null, IsError=False)</AttributeName>
+    </Attribute>
+  </Attributes>
 </Type>
diff --git a/doc/en/Gtk/Arg.xml b/doc/en/Gtk/Arg.xml
index 9ca862515..10b393dd1 100644
--- a/doc/en/Gtk/Arg.xml
+++ b/doc/en/Gtk/Arg.xml
@@ -96,4 +96,9 @@
       </Docs>
     </Member>
   </Members>
+  <Attributes>
+    <Attribute>
+      <AttributeName>System.Obsolete(Message=null, IsError=False)</AttributeName>
+    </Attribute>
+  </Attributes>
 </Type>
diff --git a/doc/en/Gtk/ItemFactoryEntry.xml b/doc/en/Gtk/ItemFactoryEntry.xml
index 420d1b2ba..20755717f 100644
--- a/doc/en/Gtk/ItemFactoryEntry.xml
+++ b/doc/en/Gtk/ItemFactoryEntry.xml
@@ -121,4 +121,9 @@
       </Docs>
     </Member>
   </Members>
+  <Attributes>
+    <Attribute>
+      <AttributeName>System.Obsolete(Message=null, IsError=False)</AttributeName>
+    </Attribute>
+  </Attributes>
 </Type>
diff --git a/generator/OpaqueGen.cs b/generator/OpaqueGen.cs
index c47c739b4..410d22173 100644
--- a/generator/OpaqueGen.cs
+++ b/generator/OpaqueGen.cs
@@ -61,6 +61,8 @@ namespace GtkSharp.Generation {
 			Method ref_, unref, dispose;
 			GetSpecialMethods (out ref_, out unref, out dispose);
 
+			if (IsDeprecated)
+				sw.WriteLine ("\t[Obsolete]");
 			sw.Write ("\tpublic class " + Name);
 			string cs_parent = table.GetCSType(Elem.GetAttribute("parent"));
 			if (cs_parent != "")
diff --git a/generator/StructBase.cs b/generator/StructBase.cs
index 91abd93ee..bb056c361 100644
--- a/generator/StructBase.cs
+++ b/generator/StructBase.cs
@@ -162,6 +162,8 @@ namespace GtkSharp.Generation {
 			sw.WriteLine ();
 			
 			sw.WriteLine ("#region Autogenerated code");
+			if (IsDeprecated)
+				sw.WriteLine ("\t[Obsolete]");
 			sw.WriteLine ("\t[StructLayout(LayoutKind.Sequential)]");
 			sw.WriteLine ("\tpublic struct " + Name + " {");
 			sw.WriteLine ();