diff --git a/ChangeLog b/ChangeLog
index 22047b09f..023fe7b18 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-04-25  Mike Kestner  <mkestner@novell.com>
+
+	* generator/OpaqueGen.cs: support declaring managed ifaces.
+	[Fixes #494193] Revised patch from Sebastian Dröge.
+
 2009-04-24  Stephane Delcroix  <sdelcroix@novell.com>
 
 	* generator/Ctor.cs: Read the name attribute for constructors
diff --git a/generator/OpaqueGen.cs b/generator/OpaqueGen.cs
index ca5bf8627..5bc640334 100644
--- a/generator/OpaqueGen.cs
+++ b/generator/OpaqueGen.cs
@@ -69,6 +69,13 @@ namespace GtkSharp.Generation {
 				sw.Write (" : " + cs_parent);
 			else
 				sw.Write (" : GLib.Opaque");
+
+			foreach (string iface in managed_interfaces) {
+				if (Parent != null && Parent.Implements (iface))
+					continue;
+				sw.Write (", " + iface);
+			}
+
 			sw.WriteLine (" {");
 			sw.WriteLine ();