diff --git a/ChangeLog b/ChangeLog
index f300020bc..f9671acd8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2009-05-06  Mike Kestner  <mkestner@novell.com>
+
+	* generator/EnumGen.cs: support 1L long values or explicit types.
+
 2009-05-06  Mike Kestner  <mkestner@novell.com>
 
 	* generator/ReturnValue.cs: null-term array marshaling for vms.
diff --git a/generator/EnumGen.cs b/generator/EnumGen.cs
index fa66af588..2be39b558 100644
--- a/generator/EnumGen.cs
+++ b/generator/EnumGen.cs
@@ -43,11 +43,16 @@ namespace GtkSharp.Generation {
 					if (value.EndsWith("U")) {
 						enum_type = " : uint";
 						value = value.TrimEnd('U');
+					} else if (value.EndsWith("L")) {
+						enum_type = " : long";
+						value = value.TrimEnd('L');
 					}
 					result += " = " + value;
 				}
 				members.Add (result + ",");
 			}
+			if (elem.HasAttribute ("enum_type"))
+				enum_type = ": " + elem.GetAttribute ("enum_type");
 		}
 
 		public override bool Validate ()