diff --git a/ChangeLog b/ChangeLog
index c0ad5715a..af82c3970 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-09-23  Mike Kestner  <mkestner@novell.com>
+
+	* generator/ReturnValue.cs: support metadata override of default return
+	values.  Based on a patch from Sebastian Dröge. [Fixes #541299]
+
 2009-09-22  Brad Taylor  <brad@getcoded.net>
 
 	* glib/Idle.cs: 
diff --git a/generator/ReturnValue.cs b/generator/ReturnValue.cs
index 05d4e7f99..927f4be00 100644
--- a/generator/ReturnValue.cs
+++ b/generator/ReturnValue.cs
@@ -32,6 +32,7 @@ namespace GtkSharp.Generation {
 		bool elements_owned;
 		bool owned;
 		string ctype = String.Empty;
+		string default_value = String.Empty;
 		string element_ctype = String.Empty;
 
 		public ReturnValue (XmlElement elem) 
@@ -42,6 +43,7 @@ namespace GtkSharp.Generation {
 				elements_owned = elem.GetAttribute ("elements_owned") == "true";
 				owned = elem.GetAttribute ("owned") == "true";
 				ctype = elem.GetAttribute("type");
+				default_value = elem.GetAttribute ("default_value");
 				element_ctype = elem.GetAttribute ("element_type");
 			}
 		}
@@ -66,6 +68,8 @@ namespace GtkSharp.Generation {
 
 		public string DefaultValue {
 			get {
+				if (default_value != null && default_value.Length > 0)
+					return default_value;
 				if (IGen == null)
 					return String.Empty;
 				return IGen.DefaultValue;