diff --git a/ChangeLog b/ChangeLog
index 98619f7d0..ccd458a39 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-11-05  Tambet Ingo  <tambet@ximian.com>
+
+	* generator/OpaqueGen.cs: Add optional "parent" attribute to Opaque
+	types.
+
 2004-11-04  Jeroen Zwartepoorte  <jeroen@xs4all.nl>
 
 	* gnomevfs/Directory.cs: Add async GetEntries Uri alias.
diff --git a/generator/OpaqueGen.cs b/generator/OpaqueGen.cs
index b9a66088e..92f96c2b9 100644
--- a/generator/OpaqueGen.cs
+++ b/generator/OpaqueGen.cs
@@ -66,10 +66,18 @@ namespace GtkSharp.Generation {
 			sw.WriteLine ();
 
 			sw.WriteLine ("#region Autogenerated code");
-			sw.Write ("\tpublic class {0} : GLib.Opaque", Name);
+
+			SymbolTable table = SymbolTable.Table;
+
+			sw.Write ("\tpublic class " + Name);
+			string cs_parent = table.GetCSType(Elem.GetAttribute("parent"));
+			if (cs_parent != "")
+				sw.Write (" : " + cs_parent);
+			else
+				sw.Write (" : GLib.Opaque");
 			sw.WriteLine (" {");
 			sw.WriteLine ();
-
+            
 			GenMethods (gen_info, null, null);
 			GenCtors (gen_info);
 			sw.WriteLine ("#endregion");