diff --git a/ChangeLog b/ChangeLog
index 704ac6bc0..8d860a683 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2004-12-18  Mike Kestner  <mkestner@novell.com>
+
+	* generator/Field.cs : add MarshalAs attrs for (u)longs.
+
 2004-12-18  Mike Kestner  <mkestner@novell.com>
 
 	* gconf/GConf/ChangeSet.cs : add internal Handle prop.
diff --git a/generator/Field.cs b/generator/Field.cs
index 3663ed113..a67818706 100644
--- a/generator/Field.cs
+++ b/generator/Field.cs
@@ -201,6 +201,12 @@ namespace GtkSharp.Generation {
 			} else if (IsPointer && CSType != "string") {
 				// FIXME: probably some fields here which should be visible.
 				sw.WriteLine ("\t\tprivate {0} {1};", CSType, Name);
+			} else if (CSType == "long") {
+				sw.WriteLine ("\t\t[MarshalAs (UnmanagedType.SysInt)]");
+				sw.WriteLine ("\t\t{0} {1} {2};", Access, CSType, StudlyName);
+			} else if (CSType == "ulong") {
+				sw.WriteLine ("\t\t[MarshalAs (UnmanagedType.SysUInt)]");
+				sw.WriteLine ("\t\t{0} {1} {2};", Access, CSType, StudlyName);
 			} else if (Access != "public") {
 				sw.WriteLine ("\t\t{0} {1} {2};", Access, CSType, Name);
 			} else {