diff --git a/ChangeLog b/ChangeLog
index 621b3bfd..4783db89 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2004-12-17  Joe Shaw  <joeshaw@novell.com>
+
+	* mono/DBusType/Byte.cs, mono/DBusType/Int32.cs,
+	mono/DBusType/Int64.cs, mono/DBusType/UInt32.cs,
+	mono/DBusType/UInt64.cs: Use Enum.GetUnderlyingType() instead of
+	Type.UnderlyingSystemType to get the actual system type
+	underneath.  This code previously depended on the broken Mono
+	behavior, which was fixed in 1.1.3.
+
 2004-11-27  Havoc Pennington  <hp@redhat.com>
 
 	* dbus/dbus-string.h (_dbus_string_get_byte): inline when asserts
diff --git a/mono/DBusType/Byte.cs b/mono/DBusType/Byte.cs
index a3d0ac9c..2fb19aeb 100644
--- a/mono/DBusType/Byte.cs
+++ b/mono/DBusType/Byte.cs
@@ -41,7 +41,7 @@ namespace DBus.DBusType
 
     public static bool Suits(System.Type type) 
     {
-      if (type.IsEnum && type.UnderlyingSystemType == typeof(System.Byte)) {
+      if (type.IsEnum && Enum.GetUnderlyingType (type) == typeof(System.Byte)) {
 	return true;
       }
 
diff --git a/mono/DBusType/Int32.cs b/mono/DBusType/Int32.cs
index 681a55f3..a759b794 100644
--- a/mono/DBusType/Int32.cs
+++ b/mono/DBusType/Int32.cs
@@ -36,7 +36,7 @@ namespace DBus.DBusType
 
     public static bool Suits(System.Type type) 
     {
-      if (type.IsEnum && type.UnderlyingSystemType == typeof(System.Int32)) {
+      if (type.IsEnum && Enum.GetUnderlyingType (type) == typeof(System.Int32)) {
 	return true;
       }
       
diff --git a/mono/DBusType/Int64.cs b/mono/DBusType/Int64.cs
index 741d272a..6aea7ee8 100644
--- a/mono/DBusType/Int64.cs
+++ b/mono/DBusType/Int64.cs
@@ -36,7 +36,7 @@ namespace DBus.DBusType
 
     public static bool Suits(System.Type type) 
     {
-      if (type.IsEnum && type.UnderlyingSystemType == typeof(System.Int64)) {
+      if (type.IsEnum && Enum.GetUnderlyingType (type) == typeof(System.Int64)) {
 	return true;
       }
 
diff --git a/mono/DBusType/UInt32.cs b/mono/DBusType/UInt32.cs
index e97aa37d..b55893d3 100644
--- a/mono/DBusType/UInt32.cs
+++ b/mono/DBusType/UInt32.cs
@@ -36,7 +36,7 @@ namespace DBus.DBusType
 
     public static bool Suits(System.Type type) 
     {
-      if (type.IsEnum && type.UnderlyingSystemType == typeof(System.UInt32)) {
+      if (type.IsEnum && Enum.GetUnderlyingType (type) == typeof(System.UInt32)) {
 	return true;
       }
 
diff --git a/mono/DBusType/UInt64.cs b/mono/DBusType/UInt64.cs
index 84fef06b..c987a918 100644
--- a/mono/DBusType/UInt64.cs
+++ b/mono/DBusType/UInt64.cs
@@ -36,7 +36,7 @@ namespace DBus.DBusType
 
     public static bool Suits(System.Type type) 
     {
-      if (type.IsEnum && type.UnderlyingSystemType == typeof(System.UInt64)) {
+      if (type.IsEnum && Enum.GetUnderlyingType (type) == typeof(System.UInt64)) {
 	return true;
       }