diff --git a/ChangeLog b/ChangeLog
index f6a32b807..c485177e0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-09-19  Tambet Ingo  <tambet@ximian.com>
+
+	* glib/Opaque.cs: Set owned property in any case. Generated code
+	will set owned to false after unref.
+
 2005-09-15  Mike Kestner  <mkestner@novell.com>
 
 	* configure.in.in : make gtkhtml-3.8 check >= 3.8.0.
diff --git a/glib/Opaque.cs b/glib/Opaque.cs
index 986413ae2..2c44f389d 100644
--- a/glib/Opaque.cs
+++ b/glib/Opaque.cs
@@ -69,8 +69,8 @@ namespace GLib {
 				if (opaque.owned) {
 					// The constructor took a Ref it shouldn't have, so undo it
 					opaque.Unref (o);
-				} else
-					opaque.owned = true;
+				}
+				opaque.owned = true;
 			}
 			return opaque;
   		}